diff --git a/ChangeLog b/ChangeLog
index 8babc8956..777720f57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 	* gobject/Makefile.am: glib.def and gobject.def are generated, not
 	in $(srcdir). (#163143, J. Ali Harlow)
 
+	* configure.in
+	* glib/Makefile.am
+	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
+	J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8babc8956..777720f57 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -4,6 +4,11 @@
 	* gobject/Makefile.am: glib.def and gobject.def are generated, not
 	in $(srcdir). (#163143, J. Ali Harlow)
 
+	* configure.in
+	* glib/Makefile.am
+	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
+	J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8babc8956..777720f57 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -4,6 +4,11 @@
 	* gobject/Makefile.am: glib.def and gobject.def are generated, not
 	in $(srcdir). (#163143, J. Ali Harlow)
 
+	* configure.in
+	* glib/Makefile.am
+	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
+	J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8babc8956..777720f57 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -4,6 +4,11 @@
 	* gobject/Makefile.am: glib.def and gobject.def are generated, not
 	in $(srcdir). (#163143, J. Ali Harlow)
 
+	* configure.in
+	* glib/Makefile.am
+	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
+	J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8babc8956..777720f57 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -4,6 +4,11 @@
 	* gobject/Makefile.am: glib.def and gobject.def are generated, not
 	in $(srcdir). (#163143, J. Ali Harlow)
 
+	* configure.in
+	* glib/Makefile.am
+	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
+	J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/configure.in b/configure.in
index 8083b7c39..35d31b19a 100644
--- a/configure.in
+++ b/configure.in
@@ -169,6 +169,11 @@ AC_SUBST(GTHREAD_DEF)
 AC_SUBST(TESTGMODULE_EXP)
 
 if test "$glib_native_win32" = "yes"; then
+  AC_CHECK_TOOL(NM, nm, no)
+  if [ "$NM" = no ]; then
+    AC_MSG_ERROR([*** Could not find an implementation of nm in your PATH.])
+  fi
+  AC_CHECK_TOOL(RANLIB, ranlib, :)
   AC_CHECK_PROG(ms_librarian, [lib.exe], [yes], [no])
 fi
 AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 832fbf82b..9b5bcc27d 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -201,9 +201,10 @@ install-libtool-import-lib:
 #	directive in .def files.)
 #
 	for entry in `grep PRIVATE glib.def | sed -e 's/PRIVATE//'`; do \
-	  file=`nm -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \
+	  file=`$(NM) -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \
 	  ar d .libs/libglib-2.0.dll.a $$file; \
 	done
+	$(RANLIB) .libs/libglib-2.0.dll.a
 	$(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
 	$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
 
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 263598a44..de1c5473b 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -54,9 +54,10 @@ install-libtool-import-lib:
 #	directive in .def files.)
 #
 	for entry in `grep PRIVATE gobject.def | sed -e 's/PRIVATE//'`; do \
-	  file=`nm -A .libs/libgobject-2.0.dll.a | grep -m 1 $$entry | cut -d: -f2`; \
+	  file=`$(NM) -A .libs/libgobject-2.0.dll.a | grep -m 1 $$entry | cut -d: -f2`; \
 	  ar d .libs/libgobject-2.0.dll.a $$file; \
 	done
+	$(RANLIB) .libs/libgobject-2.0.dll.a
 	$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
 	$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def