diff --git a/ChangeLog b/ChangeLog
index 7fe75ce39..b8064140d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-09  Duncan Mak  <duncan@ximian.com>
+
+	* sources/Gtk.metadata: Mark out params for methods in GtkCalendar,
+	GtkCellRenderer, GtkWindow, GtkRuler, GtkLayout, GtkScrolledWindow
+	and GtkSpinButton. Monotalk is very useful for this kind of work.
+
 2003-02-08  Radek Doulik  <rodo@ximian.com>
 
 	* glib/MainContext.cs: beginning of MainContext class, just
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 41bf55e5e..2e417fc32 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -1840,9 +1840,9 @@
       <method name="GetDate" cname="gtk_calendar_get_date">
         <return-type type="void"/>
         <parameters>
-          <parameter type="guint*" name="year"/>
-          <parameter type="guint*" name="month"/>
-          <parameter type="guint*" name="day"/>
+          <parameter type="guint*" name="year" pass_as="out"/>
+          <parameter type="guint*" name="month" pass_as="out"/>
+          <parameter type="guint*" name="day" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetType" cname="gtk_calendar_get_type" shared="true">
@@ -1913,8 +1913,8 @@
       <method name="GetFixedSize" cname="gtk_cell_renderer_get_fixed_size">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="gint*" name="width" pass_as="out"/>
+          <parameter type="gint*" name="height" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetSize" cname="gtk_cell_renderer_get_size">
@@ -1922,10 +1922,10 @@
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
           <parameter type="GdkRectangle*" name="cell_area"/>
-          <parameter type="gint*" name="x_offset"/>
-          <parameter type="gint*" name="y_offset"/>
-          <parameter type="gint*" name="width"/>
-          <parameter type="gint*" name="height"/>
+          <parameter type="gint*" name="x_offset" pass_as="out"/>
+          <parameter type="gint*" name="y_offset" pass_as="out"/>
+          <parameter type="gint*" name="width" pass_as="out"/>
+          <parameter type="gint*" name="height" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetType" cname="gtk_cell_renderer_get_type" shared="true">
@@ -4147,8 +4147,8 @@
       <method name="GetSize" cname="gtk_layout_get_size">
         <return-type type="void"/>
         <parameters>
-          <parameter type="guint*" name="width"/>
-          <parameter type="guint*" name="height"/>
+          <parameter type="guint*" name="width" pass_as="out"/>
+          <parameter type="guint*" name="height" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetType" cname="gtk_layout_get_type" shared="true">
@@ -5489,10 +5489,10 @@
       <method name="GetRange" cname="gtk_ruler_get_range">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gdouble*" name="lower"/>
-          <parameter type="gdouble*" name="upper"/>
-          <parameter type="gdouble*" name="position"/>
-          <parameter type="gdouble*" name="max_size"/>
+          <parameter type="gdouble*" name="lower" pass_as="out"/>
+          <parameter type="gdouble*" name="upper" pass_as="out"/>
+          <parameter type="gdouble*" name="position" pass_as="out"/>
+          <parameter type="gdouble*" name="max_size" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetType" cname="gtk_ruler_get_type" shared="true">
@@ -5610,8 +5610,8 @@
       <method name="GetPolicy" cname="gtk_scrolled_window_get_policy">
         <return-type type="void"/>
         <parameters>
-          <parameter type="GtkPolicyType*" name="hscrollbar_policy"/>
-          <parameter type="GtkPolicyType*" name="vscrollbar_policy"/>
+          <parameter type="GtkPolicyType*" name="hscrollbar_policy" pass_as="out"/>
+          <parameter type="GtkPolicyType*" name="vscrollbar_policy" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetShadowType" cname="gtk_scrolled_window_get_shadow_type">
@@ -5878,8 +5878,8 @@
       <method name="GetIncrements" cname="gtk_spin_button_get_increments">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gdouble*" name="step"/>
-          <parameter type="gdouble*" name="page"/>
+          <parameter type="gdouble*" name="step" pass_as="out"/>
+          <parameter type="gdouble*" name="page" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetNumeric" cname="gtk_spin_button_get_numeric">
@@ -5888,8 +5888,8 @@
       <method name="GetRange" cname="gtk_spin_button_get_range">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gdouble*" name="min"/>
-          <parameter type="gdouble*" name="max"/>
+          <parameter type="gdouble*" name="min" pass_as="out"/>
+          <parameter type="gdouble*" name="max" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetSnapToTicks" cname="gtk_spin_button_get_snap_to_ticks">
@@ -10025,10 +10025,10 @@
       <method name="GetFrameDimensions" cname="gtk_window_get_frame_dimensions">
         <return-type type="void"/>
         <parameters>
-          <parameter type="gint*" name="left"/>
-          <parameter type="gint*" name="top"/>
-          <parameter type="gint*" name="right"/>
-          <parameter type="gint*" name="bottom"/>
+          <parameter type="gint*" name="left" pass_as="out"/>
+          <parameter type="gint*" name="top" pass_as="out"/>
+          <parameter type="gint*" name="right" pass_as="out"/>
+          <parameter type="gint*" name="bottom" pass_as="out"/>
         </parameters>
       </method>
       <method name="GetGravity" cname="gtk_window_get_gravity">
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index a49ee7e1c..22e1c26c4 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -168,6 +168,93 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkSpinButton">
+    <method>GetIncrements</method>
+    <method>GetRange</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">gdouble*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkScrolledWindow">
+    <method>GetPolicy</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">GtkPolicyType*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkLayout">
+    <method>GetSize</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">guint*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkRuler">
+    <method>GetRange</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">gdouble*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkWindow">
+    <method>GetFrameDimensions</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">gint*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkCellRenderer">
+    <method>GetSize</method>
+    <method>GetFixedSize</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">gint*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkCalendar">
+    <method>GetDate</method>
+  </class>
+  <data>
+    <attribute target="param">
+      <filter level="type">guint*</filter>
+      <name>pass_as</name>
+      <value>out</value>
+    </attribute>
+  </data>
+</rule>
+
 
 <!-- variable arguments -->
 <rule>