diff --git a/ChangeLog b/ChangeLog
index 8976f28e4f..2c5b0bf54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 18 02:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/optparse.rb: Remove 'developer documentation' section from rdoc
+	  Patch by Marcus Stollsteimer [ruby-core:50526][Bug #7504]
+
 Tue Dec 18 02:35:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/matrix.rb (#lup): typo in example [ruby-core:50946][Bug #7582]
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 272b99d411..9648f75fd2 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -8,6 +8,7 @@
 #
 
 
+#--
 # == Developer Documentation (not for RDoc output)
 #
 # === Class tree
@@ -42,6 +43,8 @@
 #                         | all instances)|
 #                         +---------------+
 #
+#++
+#
 # == OptionParser
 #
 # === Introduction