diff --git a/.gitignore b/.gitignore
index 868b7859bdf..908f8ae200c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,7 +110,6 @@ dlls/sound.drv16
 dlls/stdole2.tlb/std_ole_v2.tlb
 dlls/stdole32.tlb/std_ole_v1.tlb
 dlls/storage.dll16
-dlls/stress.dll16
 dlls/system.drv16
 dlls/toolhelp.dll16
 dlls/twain.dll16
diff --git a/configure b/configure
index dd91eb8fe5c..362d19a009d 100755
--- a/configure
+++ b/configure
@@ -3904,6 +3904,7 @@ then
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
+    enable_stress_dll16=${enable_stress_dll16:-no}
     enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
     enable_vmm_vxd=${enable_vmm_vxd:-no}
     enable_vnbt_vxd=${enable_vnbt_vxd:-no}
@@ -26826,6 +26827,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/sti/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/stress.dll16/Makefile"
+test "x$enable_stress_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	stress.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/stress.dll16/Makefile"
+
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/strmiids/Makefile"
 test "x$enable_strmiids" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\
@@ -28954,6 +28963,7 @@ do
     "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;;
     "dlls/stdole32.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole32.tlb/Makefile" ;;
     "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;;
+    "dlls/stress.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stress.dll16/Makefile" ;;
     "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;;
     "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;;
     "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 0f7927e11f3..f738f8d6d80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,7 @@ then
     enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
     enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
     enable_monodebg_vxd=${enable_monodebg_vxd:-no}
+    enable_stress_dll16=${enable_stress_dll16:-no}
     enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
     enable_vmm_vxd=${enable_vmm_vxd:-no}
     enable_vnbt_vxd=${enable_vnbt_vxd:-no}
@@ -2184,6 +2185,7 @@ WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],
 WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b35daf0efe7..eeef5ff1bf6 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -49,7 +49,6 @@ WIN16_FILES = \
 	shell.dll16 \
 	sound.drv16 \
 	storage.dll16 \
-	stress.dll16 \
 	system.drv16 \
 	toolhelp.dll16 \
 	twain.dll16 \
@@ -91,7 +90,7 @@ dispdib.dll16 gdi.exe16 wing.dll16:
 imm.dll16:
 	echo "imm32.dll" >$@
 
-comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16:
+comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16:
 	echo "kernel32.dll" >$@
 
 lzexpand.dll16:
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index 49e6caf8966..467a576b34d 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -12,7 +12,6 @@ EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
 SPEC_SRCS16 = \
 	comm.drv.spec \
 	krnl386.exe.spec \
-	stress.spec \
 	system.drv.spec \
 	toolhelp.spec \
 	win87em.spec \
@@ -56,7 +55,6 @@ C_SRCS = \
 	resource16.c \
 	selector.c \
 	snoop16.c \
-	stress.c \
 	string.c \
 	sync.c \
 	syslevel.c \
diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in
new file mode 100644
index 00000000000..1d45fc01515
--- /dev/null
+++ b/dlls/stress.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = stress.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+
+SPEC_SRCS = stress.dll16.spec
+
+C_SRCS = stress.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/kernel32/stress.c b/dlls/stress.dll16/stress.c
similarity index 100%
rename from dlls/kernel32/stress.c
rename to dlls/stress.dll16/stress.c
diff --git a/dlls/kernel32/stress.spec b/dlls/stress.dll16/stress.dll16.spec
similarity index 100%
rename from dlls/kernel32/stress.spec
rename to dlls/stress.dll16/stress.dll16.spec