diff --git a/.gitignore b/.gitignore
index 3ba4b2e..e2f73cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,7 +118,6 @@
 dlls/w32sys.dll16
 dlls/win32s16.dll16
 dlls/winaspi.dll16
-dlls/windebug.dll16
 dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/winnls.dll16
diff --git a/configure b/configure
index c8ffeba..605d713 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index cd50b49..41ba254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,7 @@
     enable_vwin32_vxd=${enable_vwin32_vxd:-no}
     enable_w32skrnl=${enable_w32skrnl:-no}
     enable_win87em_dll16=${enable_win87em_dll16:-no}
+    enable_windebug_dll16=${enable_windebug_dll16:-no}
     enable_winedos=${enable_winedos:-no}
     enable_winevdm=${enable_winevdm:-no}
     enable_winhelp_exe16=${enable_winhelp_exe16:-no}
@@ -2221,6 +2222,7 @@
 WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index cd6103b..fe71dc6 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -57,7 +57,6 @@
 	w32sys.dll16 \
 	win32s16.dll16 \
 	winaspi.dll16 \
-	windebug.dll16 \
 	wineps16.drv16 \
 	wing.dll16 \
 	winnls.dll16 \
@@ -88,7 +87,7 @@
 imm.dll16:
 	echo "imm32.dll" >$@
 
-krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16:
+krnl386.exe16 system.drv16 toolhelp.dll16:
 	echo "kernel32.dll" >$@
 
 lzexpand.dll16:
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index f782634..d7b91d3 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -12,8 +12,7 @@
 SPEC_SRCS16 = \
 	krnl386.exe.spec \
 	system.drv.spec \
-	toolhelp.spec \
-	windebug.spec
+	toolhelp.spec
 
 C_SRCS = \
 	actctx.c \
@@ -68,7 +67,6 @@
 	virtual.c \
 	volume.c \
 	vxd.c \
-	windebug.c \
 	wowthunk.c
 
 C_SRCS16 = \
diff --git a/dlls/windebug.dll16/Makefile.in b/dlls/windebug.dll16/Makefile.in
new file mode 100644
index 0000000..5615a2c
--- /dev/null
+++ b/dlls/windebug.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = windebug.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+
+SPEC_SRCS = windebug.dll16.spec
+
+C_SRCS = windebug.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/kernel32/windebug.c b/dlls/windebug.dll16/windebug.c
similarity index 100%
rename from dlls/kernel32/windebug.c
rename to dlls/windebug.dll16/windebug.c
diff --git a/dlls/kernel32/windebug.spec b/dlls/windebug.dll16/windebug.dll16.spec
similarity index 100%
rename from dlls/kernel32/windebug.spec
rename to dlls/windebug.dll16/windebug.dll16.spec