diff --git a/patches/gnustep-back-remove-lm.patch b/patches/gnustep-back-remove-lm.patch
new file mode 100644
index 0000000..caf303b
--- /dev/null
+++ b/patches/gnustep-back-remove-lm.patch
@@ -0,0 +1,26 @@
+diff --git a/configure b/configure
+index 55ce041..b0eaaa5 100755
+--- a/configure
++++ b/configure
+@@ -6375,7 +6375,7 @@ else $as_nop
+ fi
+ 
+ if test "$have_gdi32" = yes; then
+-  WIN32_LIBS="-lgdi32 -lm"
++  WIN32_LIBS="-lgdi32"
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lmsimg32" >&5
+ printf %s "checking for main in -lmsimg32... " >&6; }
+diff --git a/configure.ac b/configure.ac
+index 93b8ba1..2b73c86 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -393,7 +393,7 @@ AC_CHECK_LIB(X11, XInternAtoms,
+ #--------------------------------------------------------------------
+ AC_CHECK_LIB(gdi32, main, have_gdi32=yes, have_gdi32=no)
+ if test "$have_gdi32" = yes; then
+-  WIN32_LIBS="-lgdi32 -lm"
++  WIN32_LIBS="-lgdi32"
+ fi
+ AC_CHECK_LIB(msimg32, main, have_msimg32=yes, have_msimg32=no)
+ if test "$have_msimg32" = yes; then
diff --git a/patches/gnustep-back-winbool.patch b/patches/gnustep-back-winbool.patch
new file mode 100644
index 0000000..84742ae
--- /dev/null
+++ b/patches/gnustep-back-winbool.patch
@@ -0,0 +1,48 @@
+diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m
+index e98c401..ae989d8 100644
+--- a/Source/win32/WIN32Server.m
++++ b/Source/win32/WIN32Server.m
+@@ -187,7 +187,7 @@ BOOL CALLBACK LoadDisplayMonitorInfo(HMONITOR hMonitor,
+ - (void) callback: (id)sender
+ {
+   MSG msg;
+-  WINBOOL bRet; 
++  WinBOOL bRet; 
+ //NSLog(@"Callback");
+   while ((bRet = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) != 0)
+     { 
+@@ -2192,7 +2192,7 @@ LRESULT CALLBACK windowEnumCallback(HWND hwnd, LPARAM lParam)
+         {
+           HDC     hdc = GetDC(hwnd);
+           RECT    r   = GSWindowRectToMS(self, hwnd, rect);
+-          WINBOOL result;
++          WinBOOL result;
+ 
+           result = BitBlt(hdc, r.left, r.top, 
+                           (r.right - r.left), (r.bottom - r.top), 
+diff --git a/Source/win32/w32_windowdisplay.m b/Source/win32/w32_windowdisplay.m
+index 8f61e9e..d1ae727 100644
+--- a/Source/win32/w32_windowdisplay.m
++++ b/Source/win32/w32_windowdisplay.m
+@@ -59,7 +59,7 @@ invalidateWindow(WIN32Server *svr, HWND hwnd, RECT rect)
+   if (win->useHDC)
+     {
+       HDC hdc = GetDC((HWND)hwnd);
+-      WINBOOL result;
++      WinBOOL result;
+ 
+       result = BitBlt(hdc, rect.left, rect.top, 
+ 		      (rect.right - rect.left), (rect.bottom - rect.top), 
+diff --git a/Tools/win32pbs.m b/Tools/win32pbs.m
+index 740dc7c..2a3ef90 100755
+--- a/Tools/win32pbs.m
++++ b/Tools/win32pbs.m
+@@ -279,7 +279,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
+ - (void) callback: (id) sender
+ {
+   MSG msg;
+-  WINBOOL bRet; 
++  WinBOOL bRet; 
+ 
+   while ((bRet = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) != 0)
+     { 
diff --git a/phases/51-gnustep-back.sh b/phases/51-gnustep-back.sh
index a73692b..5ef216c 100644
--- a/phases/51-gnustep-back.sh
+++ b/phases/51-gnustep-back.sh
@@ -21,8 +21,8 @@ echo
 echo "### Running configure"
 
 ./configure \
-    --enable-graphics=headless \
-    --enable-server=headless \
+    --enable-graphics=winlib \
+    --enable-server=win32 \
     --without-freetype \
     --host=$TARGET \
     CFLAGS="-Wno-int-conversion"