diff --git a/ChangeLog b/ChangeLog
index 63a5d194a..d2cf7c2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-02  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in: forward port of a win32 fix from 2-12-branch.
+
 2009-05-01  Mike Kestner  <mkestner@novell.com>
 
 	* glib/Object.cs: get gtype from instance data.
diff --git a/configure.in.in b/configure.in.in
index d9adae5a1..f6e8064d2 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -63,11 +63,6 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-if test x$platform_win32 = xyes; then
-   # Get rid of 'cyg' prefixes in library names
-   sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
-fi
-
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
@@ -277,6 +272,11 @@ sample/gio/Makefile
 sample/gtk-gio/Makefile
 ])
 
+if test x$platform_win32 = xyes; then
+   # Get rid of 'cyg' prefixes in library names
+   sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
+fi
+
 if test "x$enable_mono_cairo" = "xyes"; then
   cairo_comment="building local copy"
 else