diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 405afc1dd..b22f05d02 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-08  Matthias Clasen <mclasen@redhat.com>
+
+	Merge from trunk:
+
+	* glib-mkenums.in: Don't shift ARGV[0] to undefined. 
+	(#466557, Aidan Delaney)
+
 2007-11-07  Matthias Clasen <mclasen@redhat.com>
 
 	* === Released 2.14.3 ===
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index cabb0f777..e7e00eaf9 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -215,7 +215,7 @@ sub read_template_file {
 if (!defined $ARGV[0]) {
     usage;
 }
-while ($_ = $ARGV[0], /^-/) {
+while ($_=$ARGV[0],/^-/) {
     shift;
     last if /^--$/;
     if (/^--template$/)              { read_template_file (shift); }
@@ -230,6 +230,7 @@ while ($_ = $ARGV[0], /^-/) {
     elsif (/^--help$/ || /^-h$/)     { usage; }
     elsif (/^--version$/ || /^-v$/)  { version; }
     else { usage; }
+    last if not defined($ARGV[0]);
 }
 
 # put auto-generation comment