diff --git a/ChangeLog b/ChangeLog
index 27f843ab4..3dfb77009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-17  Rachel Hestilow  <hestilow@ximian.com>
+
+	* parser/Gtk.metadata: Tag MenuItem.SetSubmenu as null-ok.
+
 2002-07-17  Rachel Hestilow  <hestilow@ximian.com>
 
 	* generator/Method.cs: Honor array in return type.
diff --git a/generator/gtkapi.xml b/generator/gtkapi.xml
index 9d540a7b5..a2106a9f6 100644
--- a/generator/gtkapi.xml
+++ b/generator/gtkapi.xml
@@ -12004,7 +12004,7 @@
       <method name="SetSubmenu" cname="gtk_menu_item_set_submenu">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GtkWidget*" name="submenu"/>
+          <parameter type="GtkWidget*" name="submenu" null_ok="1"/>
         </parameters>
       </method>
       <method name="Activate" cname="gtk_menu_item_activate">
diff --git a/parser/Gtk.metadata b/parser/Gtk.metadata
index d0532835a..78a67000b 100644
--- a/parser/Gtk.metadata
+++ b/parser/Gtk.metadata
@@ -1645,5 +1645,17 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkMenuItem">
+    <method>SetSubmenu</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">GtkWidget*</filter>
+      <name>null_ok</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 </metadata>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index d0532835a..78a67000b 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -1645,5 +1645,17 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkMenuItem">
+    <method>SetSubmenu</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">GtkWidget*</filter>
+      <name>null_ok</name>
+      <value>1</value>
+    </attribute>
+  </data>
+</rule>
 
 </metadata>