diff --git a/ChangeLog b/ChangeLog
index 3515a4edb..7a1e990d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* glib/Makefile.am (TESTS): Only check the ABI on 
+	linux, since the shell script is not portable, and libtool
+	deficiencies may distort the ABI on other platforms.  (#161741)
+
 2004-12-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_entry): Don't show
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3515a4edb..7a1e990d6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* glib/Makefile.am (TESTS): Only check the ABI on 
+	linux, since the shell script is not portable, and libtool
+	deficiencies may distort the ABI on other platforms.  (#161741)
+
 2004-12-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_entry): Don't show
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3515a4edb..7a1e990d6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* glib/Makefile.am (TESTS): Only check the ABI on 
+	linux, since the shell script is not portable, and libtool
+	deficiencies may distort the ABI on other platforms.  (#161741)
+
 2004-12-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_entry): Don't show
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3515a4edb..7a1e990d6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* glib/Makefile.am (TESTS): Only check the ABI on 
+	linux, since the shell script is not portable, and libtool
+	deficiencies may distort the ABI on other platforms.  (#161741)
+
 2004-12-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_entry): Don't show
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3515a4edb..7a1e990d6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Add an OS_LINUX conditional.
+
+	* glib/Makefile.am (TESTS): Only check the ABI on 
+	linux, since the shell script is not portable, and libtool
+	deficiencies may distort the ABI on other platforms.  (#161741)
+
 2004-12-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/goption.c (print_entry): Don't show
diff --git a/configure.in b/configure.in
index 45df86273..a001976de 100644
--- a/configure.in
+++ b/configure.in
@@ -147,9 +147,17 @@ case "$host" in
     glib_pid_type=int
     ;;
 esac
+case $host in
+  *-*-linux*)
+    glib_os_linux=yes
+    ;;
+esac
+
+
 AC_MSG_RESULT([$glib_native_win32])
 AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
 AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
+AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
 AC_SUBST(G_LIB_WIN32_RESOURCE)
 AC_SUBST(G_MODULE_WIN32_RESOURCE)
 AC_SUBST(G_OBJECT_WIN32_RESOURCE)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index c07dac4e7..bae30d3ba 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -19,7 +19,7 @@ glib.def: glib.symbols
 galias.h: glib.symbols
 	  $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
 
-if OS_UNIX
+if OS_LINUX
 TESTS = abicheck.sh
 endif
 
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 484d0fdf7..6ec362d52 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* Makefile.am: Only check the ABI on linux, since
+	the shell script is not portable.  (#161734, Adrian Bunk)
+
 2004-12-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.6.0 ===
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index e2ee042ae..3c2e1d934 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -19,7 +19,7 @@ gobject.def: gobject.symbols
 gobjectalias.h: gobject.symbols
 	$(PERL) $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h
 
-if OS_UNIX
+if OS_LINUX
 TESTS = abicheck.sh
 endif