diff --git a/ChangeLog b/ChangeLog
index 7210f75923..5e49c3369c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-28  Sven Neumann  <sven@gimp.org>
+
+	* tools/gimp-mkenums: synced with glib-mkenums (execept for the
+	newly added template feature).
+
 2004-07-28  Michael Natterer  <mitch@gimp.org>
 
 	* libgimp/gimpbrushselect.c
diff --git a/tools/gimp-mkenums b/tools/gimp-mkenums
index 7892ff2ff1..4f45e23f29 100755
--- a/tools/gimp-mkenums
+++ b/tools/gimp-mkenums
@@ -11,6 +11,8 @@
 # gimp-mkenums
 # Information about the current enumeration
 my $flags;			# Is enumeration a bitmask?
+my $option_lowercase_name;			# A lower case name to use as part of the *_get_type() function, instead of the one that we guess.
+                        # For instance, when an enum uses abnormal capitalization and we can not guess where to put the underscores.
 my $seenbitshift;		# Have we seen bitshift operators?
 my $enum_prefix;		# Prefix for this enumeration
 my $enumname;			# Name for this enumeration
@@ -26,7 +28,7 @@ sub parse_trigraph {
     for $opt (split /\s*,\s*/, $opts) {
 	$opt =~ s/^\s*//;
 	$opt =~ s/\s*$//;
-        my ($key,$val) = $opt =~ /([-\w]+)(?:=(.+))?/;
+        my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;
 	defined $val or $val = 1;
 	push @opts, $key, $val;
     }