diff --git a/ChangeLog b/ChangeLog
index bc68f9346f..c111e8b64d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk-engine-check-abi.sh: Add a script to check that theme
+	engines don't export any extra functions. 
+
 2006-03-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_init): Avoid a mnemonic
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bc68f9346f..c111e8b64d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk-engine-check-abi.sh: Add a script to check that theme
+	engines don't export any extra functions. 
+
 2006-03-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcolorsel.c (gtk_color_selection_init): Avoid a mnemonic
diff --git a/gtk-engine-check-abi.sh b/gtk-engine-check-abi.sh
new file mode 100755
index 0000000000..5cade631ce
--- /dev/null
+++ b/gtk-engine-check-abi.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Check that a theme engine does not export any 
+# functions that may interfere with symbol resolution
+
+cat >expected-abi <<EOF
+theme_create_rc_style
+theme_exit
+theme_init
+EOF
+
+cat >optional-abi <<EOF
+__bss_start
+_edata
+_end
+_fini
+_init
+g_module_check_init
+g_module_unload
+EOF
+
+nm -D -g --defined-only $1 | cut -d ' ' -f 3 > actual-abi
+
+cat optional-abi >>expected-abi
+sort expected-abi | uniq >expected-abi2
+
+cat optional-abi >>actual-abi
+sort actual-abi | uniq >actual-abi2
+
+diff -u expected-abi2 actual-abi2 && rm expected-abi optional-abi actual-abi expected-abi2 actual-abi2