diff --git a/ChangeLog b/ChangeLog
index 43942c56d..4f94b89d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/Makefile.am: #define HELPER_CONSOLE in
+	gspawn-win32-helper-console.c
+
+	* glib/gspawn-win32-helper.c: Compile a main() instead of
+	WinMain() if HELPER_CONSOLE is defined.
+
 2008-05-18  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 527214 – g_timer_elapsed() returns random values.
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 2e8b7066b..24d3bfe34 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -298,7 +298,8 @@ libglib_2_0_la_LDFLAGS = \
 INSTALL_PROGS=
 
 gspawn-win32-helper-console.c:
-	echo '#include "gspawn-win32-helper.c"' >$@
+	echo '#define HELPER_CONSOLE' >$@
+	echo '#include "gspawn-win32-helper.c"' >>$@
 
 if OS_WIN32
 INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index 1a717edc2..c24f156ba 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -147,11 +147,16 @@ protect_wargv (wchar_t  **wargv,
   return argc;
 }
 
+#ifndef HELPER_CONSOLE
 int _stdcall
 WinMain (struct HINSTANCE__ *hInstance,
 	 struct HINSTANCE__ *hPrevInstance,
 	 char               *lpszCmdLine,
 	 int                 nCmdShow)
+#else
+int
+main (int ignored_argc, char **ignored_argv)
+#endif
 {
   int child_err_report_fd = -1;
   int helper_sync_fd = -1;