diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1a7705f8e6..9daeafe9d1 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-06  Cary Coutant  <ccoutant@google.com>
+
+	* options.cc (parse_short_option): Keep dash_z from registering itself.
+
 2009-03-03  Ian Lance Taylor  <iant@google.com>
 
 	PR 9918
diff --git a/gold/options.cc b/gold/options.cc
index 3f6fbfa4aa..a62c6e1f79 100644
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -587,7 +587,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
 
   // We handle -z as a special case.
   static gold::options::One_option dash_z("", gold::options::DASH_Z,
-                                          'z', "", "-z", "Z-OPTION", false,
+                                          'z', "", NULL, "Z-OPTION", false,
 					  NULL);
   gold::options::One_option* retval = NULL;
   if (this_argv[pos_in_argv_i] == 'z')