diff --git a/configure.ac b/configure.ac
index ea35a7c..53065fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,20 @@ else
 fi
 
 # GObject introspection
-GOBJECT_INTROSPECTION_CHECK([0.6.8])
+
+AC_ARG_ENABLE(gobject-introspection,
+    AS_HELP_STRING([--disable-gobject-introspection],
+                   [Do not use gobject-introspection code]),
+    [enable_gobject_introspection=$enableval],
+    [enable_gobject_introspection=yes]
+)
+AM_CONDITIONAL([HAVE_INTROSPECTION], [test "x$enable_gobject_introspection" = "xyes"])
+
+if test x"$enable_gobject_introspection" = x"yes"; then
+    GOBJECT_INTROSPECTION_CHECK([0.6.8])
+else
+    AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
+fi
 
 # check for gtk-doc
 GTK_DOC_CHECK(1.9)
@@ -374,7 +387,7 @@ Build options:
   Build XIM agent server    $enable_xim
   Build python modules      $enable_python
   Build gconf modules       $enable_gconf
-  Build introspection       $found_introspection
+  Build introspection       $enable_gobject_introspection
   Build vala binding        $enable_vala
   Build document            $enable_gtk_doc
   Enable key snooper        $enable_key_snooper