diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 33e633a1d8..b8dcab4081 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -335,37 +335,33 @@ How to compile GTK+ itself
 	    <arg>--enable-debug=[no|minimum|yes]</arg>
 	  </group>
           <group>
-	    <arg>--disable-visibility</arg>
-	    <arg>--enable-visibility</arg>
-	  </group>
+            <arg>--disable-visibility</arg>
+            <arg>--enable-visibility</arg>
+          </group>
           <group>
-	    <arg>--disable-shm</arg>
-	    <arg>--enable-shm</arg>
-	  </group>
+            <arg>--disable-shm</arg>
+            <arg>--enable-shm</arg>
+          </group>
           <group>
-	    <arg>--disable-xim</arg>
-	    <arg>--enable-xim</arg>
-	  </group>
+            <arg>--disable-xkb</arg>
+            <arg>--enable-xkb</arg>
+          </group>
           <group>
-	    <arg>--disable-xim-inst</arg>
-	    <arg>--enable-xim-inst</arg>
-	  </group>
+            <arg>--disable-xinerama</arg>
+            <arg>--enable-xinerama</arg>
+          </group>
           <group>
-	    <arg>--disable-xkb</arg>
-	    <arg>--enable-xkb</arg>
-	  </group>
+            <arg>--disable-gtk-doc</arg>
+            <arg>--enable-gtk-doc</arg>
+          </group>
           <group>
-	    <arg>--disable-xinerama</arg>
-	    <arg>--enable-xinerama</arg>
-	  </group>
-	  <group>
-	    <arg>--disable-gtk-doc</arg>
-	    <arg>--enable-gtk-doc</arg>
-	  </group>
-	  <group>
-	    <arg>--disable-cups</arg>
-	    <arg>--enable-cups</arg>
-	  </group>
+            <arg>--disable-cups</arg>
+            <arg>--enable-cups</arg>
+          </group>
+          <group>
+            <arg>--disable-papi</arg>
+            <arg>--enable-papi</arg>
+          </group>
           <group>
             <arg>--with-xinput=[no|yes]</arg>
           </group>
@@ -472,30 +468,6 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
-      <formalpara>
-        <title><systemitem>--disable-xim</systemitem> and
-          <systemitem>--enable-xim</systemitem></title>
- 
-        <para>
-          These options can be used to control whether GTK+ will 
-          be compiled with support for XIM. (The X Input Method
-	  extension, used for Japanese input.) The default is yes.
-        </para>
-      </formalpara>
-
-      <formalpara>
-        <title><systemitem>--disable-xim-inst</systemitem> and
-          <systemitem>--enable-xim-inst</systemitem></title>
- 
-        <para>
-          These options determine whether GTK+ will use the 
-	  XIM instantiate callback. 
-          The default is 'yes', unless the host system is Solaris,
-	  where <function>XRegisterIMInstantiateCallback()</function>
-	  seems to cause a segfault.
-        </para>
-      </formalpara>
-
       <formalpara>
         <title><systemitem>--disable-xkb</systemitem> and
           <systemitem>--enable-xkb</systemitem></title>