diff --git a/.gitignore b/.gitignore
index ade07836ed7..3cae64966a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
 dlls/atl/atliface.h
 dlls/dxdiagn/fil_data.h
-dlls/gdi.exe16
 dlls/jscript/jsglobal.tlb
 dlls/jscript/parser.tab.c
 dlls/jscript/parser.tab.h
diff --git a/configure b/configure
index 275a1efb356..4f52528c82c 100755
--- a/configure
+++ b/configure
@@ -14896,6 +14896,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/fwpuclnt/Makefile: dlls/fwpuclnt/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/fwpuclnt/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/gdi.exe16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	gdi.exe16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/gdi.exe16/Makefile: dlls/gdi.exe16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/gdi.exe16/Makefile"
+
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/gdi32/Makefile"
 test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@@ -18947,6 +18955,7 @@ do
     "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;;
     "dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;;
     "dlls/fwpuclnt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fwpuclnt/Makefile" ;;
+    "dlls/gdi.exe16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi.exe16/Makefile" ;;
     "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;;
     "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;;
     "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 6e4d892724a..e5ff544f873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2250,6 +2250,7 @@ WINE_CONFIG_MAKEFILE([dlls/fltlib/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
 WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/fwpuclnt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/gdi.exe16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 5150da9103d..092986e70b3 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -18,7 +18,6 @@ DOCSUBDIRS     = $(DLLSUBDIRS)
 # 16-bit dlls
 
 WIN16_FILES = \
-	gdi.exe16 \
 	krnl386.exe16 \
 	user.exe16 \
 	wprocs.dll16
@@ -31,9 +30,6 @@ all: $(BUILDSUBDIRS) @WIN16_FILES@
 
 # Placeholders for 16-bit libraries
 
-gdi.exe16:
-	echo "gdi32.dll" >$@
-
 krnl386.exe16:
 	echo "kernel32.dll" >$@
 
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
new file mode 100644
index 00000000000..ab845a5ac0c
--- /dev/null
+++ b/dlls/gdi.exe16/Makefile.in
@@ -0,0 +1,22 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = gdi.exe16
+IMPORTS   = user32 advapi32 gdi32 kernel32
+
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,gdi32.dll,--heap,65520
+EXTRARCFLAGS  = -O res16
+
+C_SRCS = \
+	bidi.c \
+	env.c \
+	gdi.c \
+	metafile.c \
+	printdrv.c
+
+RC_SRCS = version.rc
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/gdi32/bidi16.c b/dlls/gdi.exe16/bidi.c
similarity index 100%
rename from dlls/gdi32/bidi16.c
rename to dlls/gdi.exe16/bidi.c
diff --git a/dlls/gdi32/env.c b/dlls/gdi.exe16/env.c
similarity index 100%
rename from dlls/gdi32/env.c
rename to dlls/gdi.exe16/env.c
diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi.exe16/gdi.c
similarity index 100%
rename from dlls/gdi32/gdi16.c
rename to dlls/gdi.exe16/gdi.c
diff --git a/dlls/gdi32/gdi.exe.spec b/dlls/gdi.exe16/gdi.exe16.spec
similarity index 100%
rename from dlls/gdi32/gdi.exe.spec
rename to dlls/gdi.exe16/gdi.exe16.spec
diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi.exe16/metafile.c
similarity index 100%
rename from dlls/gdi32/metafile16.c
rename to dlls/gdi.exe16/metafile.c
diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi.exe16/printdrv.c
similarity index 99%
rename from dlls/gdi32/printdrv16.c
rename to dlls/gdi.exe16/printdrv.c
index f0b8cf07b35..aee0e65f158 100644
--- a/dlls/gdi32/printdrv16.c
+++ b/dlls/gdi.exe16/printdrv.c
@@ -48,7 +48,6 @@
 #include "winreg.h"
 #include "wownt32.h"
 #include "wine/debug.h"
-#include "gdi_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(print);
 
diff --git a/dlls/gdi32/version16.rc b/dlls/gdi.exe16/version.rc
similarity index 100%
rename from dlls/gdi32/version16.rc
rename to dlls/gdi.exe16/version.rc
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index 3202e7383da..16ea5b4a9bd 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -9,8 +9,6 @@ IMPORTS   = advapi32 kernel32 ntdll
 EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
 EXTRALIBS = @CARBONLIB@
 
-SPEC_SRCS16 = gdi.exe.spec
-
 C_SRCS = \
 	bidi.c \
 	bitblt.c \
@@ -49,15 +47,7 @@ C_SRCS = \
 	printdrv.c \
 	region.c
 
-C_SRCS16 = \
-	bidi16.c \
-	env.c \
-	gdi16.c \
-	metafile16.c \
-	printdrv16.c
-
 RC_SRCS = version.rc
-RC_SRCS16 = version16.rc
 
 EXTRASUBDIRS = \
 	enhmfdrv \
@@ -65,12 +55,4 @@ EXTRASUBDIRS = \
 
 @MAKE_DLL_RULES@
 
-# Special rules for 16-bit resource and spec files
-
-gdi.exe.spec.o: gdi.exe.spec version16.res
-	$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res version16.res --export $(SRCDIR)/gdi.exe.spec
-
-version16.res: version16.rc
-	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
-
 @DEPENDENCIES@  # everything below this line is overwritten by make depend