diff --git a/Makefile.am b/Makefile.am
index 44e2c3d..7040e41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,4 +20,4 @@ DISTCLEANFILES = intltool-extract \
                  intltool-update \
                  gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --enable-introspection
diff --git a/configure.ac b/configure.ac
index 25c4f0a..b1f6050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,12 @@ dnl ================================================================
 GTK_DOC_CHECK(1.9)
 
 dnl ================================================================
+dnl Check for introspection
+dnl ================================================================
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+
+dnl ================================================================
 dnl Check for gtk+
 dnl ================================================================
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.20 gthread-2.0 libxml-2.0 >= 2.4.0])
diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
index 490d835..a3c7e68 100644
--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
@@ -162,5 +162,35 @@ glade-marshallers.c: glade-marshallers.list $(GLIB_GENMARSHAL)
 	&& mv glade-marshallers-c.tmp glade-marshallers.c \
 	|| ( rm -f glade-marshallers-c.tmp && exit 1 )
 
-
 CLEANFILES = $(BUILT_SOURCES) gladeui.def
+
+#
+# Introspection generation
+#
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --strip-prefix=Glade --pkg=gtk+-2.0 -I../
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libgladeui_1_la_SOURCES) $(libgladeuiinclude_HEADERS)
+
+Gladeui-1.0.gir: libgladeui-1.la
+Gladeui_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
+Gladeui_1_0_gir_CFLAGS = $(INCLUDES)
+Gladeui_1_0_gir_LIBS = libgladeui-1.la  
+Gladeui_1_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Gladeui-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+endif
+
+
+
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index 8c52bb1..52e9d56 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -122,9 +122,9 @@ glade_pointer_mode_get_type (void)
 	{
 		static const GEnumValue values[] = 
 		{
-			{ GLADE_POINTER_SELECT,      "select",      "Select widgets" },
-			{ GLADE_POINTER_ADD_WIDGET,  "add",         "Add widgets" },
-			{ GLADE_POINTER_DRAG_RESIZE, "drag-resize", "Drag and resize widgets" },
+			{ GLADE_POINTER_SELECT,      "select",      "Select-widgets" },
+			{ GLADE_POINTER_ADD_WIDGET,  "add",         "Add-widgets" },
+			{ GLADE_POINTER_DRAG_RESIZE, "drag-resize", "Drag-and-resize-widgets" },
 			{ 0, NULL, NULL }
 		};
 		etype = g_enum_register_static ("GladePointerMode", 
