diff --git a/ChangeLog b/ChangeLog
index 2fcaa89d34..1ab003d10a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* */Makefile.am: use $(GLIB_MKENUMS) instead of
+	glib-mkenums.  (#318582, Damien Carbery)
+
 	* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify
 	docs.  (#317682, Christian - Manny Calavera - Neumair)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2fcaa89d34..1ab003d10a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* */Makefile.am: use $(GLIB_MKENUMS) instead of
+	glib-mkenums.  (#318582, Damien Carbery)
+
 	* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify
 	docs.  (#317682, Christian - Manny Calavera - Neumair)
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 0c1d650c03..7dc357c5ca 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -234,7 +234,7 @@ BUILT_SOURCES =					\
 gdkenumtypes.h: stamp-gdkenumtypes.h
 	@true
 stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename@\" */\n" \
 			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
@@ -244,7 +244,7 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile
 	&& rm -f xgen-geth \
 	&& echo timestamp > $(@F)
 gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \
 			--fprod "\n/* enumerations from \"@filename@\" */" \
 			--ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \