diff --git a/Makefile.am b/Makefile.am
index d128928813ae2692c7c83a4a55ece273da720c64..f697f3afec5ee546bda1810b1955240416440b17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,8 @@ EXTRA_DIST =								\
 	$(desktop_in_in_files)						\
 	$(service_in_files)						\
 	$(appdata_in_files)						\
-	$(polkit_in_in_files)
+	$(polkit_in_in_files)					\
+	m4/introspection.m4
 
 CLEANFILES		= $(appdata_DATA)
 
diff --git a/thunarx/Makefile.am b/thunarx/Makefile.am
index 0a0aca39e2c78123b448916bf5edbcf41fef0102..be5ff4e5be99d59e451fc425fdd5a2f070e5d690 100644
--- a/thunarx/Makefile.am
+++ b/thunarx/Makefile.am
@@ -103,8 +103,16 @@ dist-hook: all
 #AM_DEFAULT_VERBOSITY = 1
 
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -I.. -DTHUNARX_COMPILATION
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	--add-include-path=$(prefix)/share/gir-1.0 \
+	-I$(srcdir)/.. \
+	--warn-all \
+	-DTHUNARX_COMPILATION
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=$(srcdir) \
+	--includedir=$(prefix)/share/gir-1.0 \
+	--includedir=.
 
 if HAVE_INTROSPECTION
 Thunarx-3.0.gir: libthunarx-3.la