diff --git a/configure.ac b/configure.ac
index 089bb3f15d..bf258a0776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1543,7 +1543,7 @@ fi
 # GObject introspection
 ##################################################
 
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_CHECK([0.9.5])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index fdd17cded9..9247570cd5 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -177,7 +177,7 @@ introspection_files = 		\
         gdkenumtypes.h
 
 Gdk-3.0.gir: $(gdktargetlib) Makefile
-Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
+Gdk_3_0_gir_SCANNERFLAGS = --warn-all
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = $(gdktargetlib)
 Gdk_3_0_gir_FILES = $(introspection_files)
@@ -225,7 +225,7 @@ x11_introspection_files = 		\
         x11/gdkx.h
 
 GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11
+GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = $(gdktargetlib)
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b2a03f39b4..398dd3d405 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -908,7 +908,7 @@ introspection_files = \
     gtktypebuiltins.c
 
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk --add-include-path=$(top_builddir)/gdk
+Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 endif