diff --git a/reactos/drivers/multimedia/audio/directory.rbuild b/reactos/drivers/multimedia/audio/directory.rbuild
index 365934a279b..242af7b537c 100644
--- a/reactos/drivers/multimedia/audio/directory.rbuild
+++ b/reactos/drivers/multimedia/audio/directory.rbuild
@@ -1,5 +1,9 @@
-<directory name="mpu401">
-	<xi:include href="mpu401/mpu401.rbuild" />
+<!--
+<directory name="mpu401_nt4">
+	<xi:include href="mpu401_nt4/mpu401.rbuild" />
+</directory>
+<directory name="sb16_nt4">
+	<xi:include href="sb16_nt4/sb16_nt4.rbuild" />
 </directory>
 <directory name="sndblst">
 	<xi:include href="sndblst/sndblst.rbuild" />
@@ -7,3 +11,4 @@
 <directory name="sound">
 	<xi:include href="sound/sound.rbuild" />
 </directory>
+-->
diff --git a/reactos/drivers/multimedia/audio/mpu401/mpu401.c b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/mpu401.c
rename to reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c
diff --git a/reactos/drivers/multimedia/audio/mpu401/mpu401.h b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/mpu401.h
rename to reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.h
diff --git a/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild
similarity index 66%
rename from reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild
rename to reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild
index 9c924d3959e..2121a04e009 100644
--- a/reactos/drivers/multimedia/audio/mpu401/mpu401.rbuild
+++ b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild
@@ -1,5 +1,10 @@
+<!--
+	Conflicts with Kernel Streaming MPU401 driver.
+	Here for reference only.
+-->
+
 <module name="mpu401" type="kernelmodedriver">
-	<include base="mpu401">.</include>
+	<include base="mpu401_nt4">.</include>
         <define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/multimedia/audio/mpu401/mpu401.rc b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
similarity index 78%
rename from reactos/drivers/multimedia/audio/mpu401/mpu401.rc
rename to reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
index 45f6374e2df..ba6a0d5f32f 100644
--- a/reactos/drivers/multimedia/audio/mpu401/mpu401.rc
+++ b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mpu401.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"MPU-401 MIDI Driver\0"
diff --git a/reactos/drivers/multimedia/audio/mpu401/portio.c b/reactos/drivers/multimedia/audio/mpu401_nt4/portio.c
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/portio.c
rename to reactos/drivers/multimedia/audio/mpu401_nt4/portio.c
diff --git a/reactos/drivers/multimedia/audio/mpu401/readme.txt b/reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/readme.txt
rename to reactos/drivers/multimedia/audio/mpu401_nt4/readme.txt
diff --git a/reactos/drivers/multimedia/audio/mpu401/sbdebug.h b/reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/sbdebug.h
rename to reactos/drivers/multimedia/audio/mpu401_nt4/sbdebug.h
diff --git a/reactos/drivers/multimedia/audio/mpu401/settings.c b/reactos/drivers/multimedia/audio/mpu401_nt4/settings.c
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/settings.c
rename to reactos/drivers/multimedia/audio/mpu401_nt4/settings.c
diff --git a/reactos/drivers/multimedia/audio/mpu401/test.c b/reactos/drivers/multimedia/audio/mpu401_nt4/test.c
similarity index 100%
rename from reactos/drivers/multimedia/audio/mpu401/test.c
rename to reactos/drivers/multimedia/audio/mpu401_nt4/test.c