diff --git a/Makefile.cfg b/Makefile.cfg
index cdf351bf29183c7ea0df50aac94de27d3f802545..6986150af708f1b5624ded67f2bf4140d1b92e1b 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -47,7 +47,8 @@ MODULES += Filesystems/FAT
 MODULES += Filesystems/NTFS
 
 ifeq ($(ARCHDIR),x86)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
 MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/VESA
 MODULES += Display/BochsGA
@@ -58,7 +59,8 @@ MODULES += USB/Core
 endif
 
 ifeq ($(ARCHDIR),x86_64)
-MODULES += Storage/ATA Storage/FDD
+MODULES += Storage/ATA
+MODULES += Storage/FDDv2
 MODULES += Network/NE2000 Network/RTL8139
 MODULES += Display/BochsGA
 MODULES += Interfaces/UDI
diff --git a/Modules/Storage/FDDv2/fdc.c b/Modules/Storage/FDDv2/fdc.c
index 5f315aaa96925a246de193fdeb2b8cb120070975..d5711d92af204c6802fbc8ba2cbec5207109cd46 100644
--- a/Modules/Storage/FDDv2/fdc.c
+++ b/Modules/Storage/FDDv2/fdc.c
@@ -5,7 +5,7 @@
  * fdc.c
  * - FDC IO Functions
  */
-#define DEBUG	1
+#define DEBUG	0
 #include <acess.h>
 #include "common.h"
 #include <dma.h>
@@ -105,7 +105,7 @@ int FDD_int_ReadWriteTrack(int Disk, int Track, int bWrite, void *Buffer)
 	Uint16	base = FDD_int_GetBase(Disk, &_disk);
 	 int	cyl = Track >> 1, head = Track & 1;
 
-	ENTER("iDisk iTrack BbWrite pBuffer", Disk, Track, bWrite, Buffer);
+	ENTER("iDisk iTrack ibWrite pBuffer", Disk, Track, bWrite, Buffer);
 
 	Mutex_Acquire( &gFDD_IOMutex );