diff --git a/configure.ac b/configure.ac
index 2a33ebd9cb..4e9790497b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -664,6 +664,7 @@ initscript/Mandriva/networkmanager
 initscript/linexa/Makefile
 initscript/linexa/networkmanager
 introspection/Makefile
+introspection/all.xml
 man/Makefile
 man/NetworkManager.8
 man/NetworkManager.conf.5
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 687d9cfb1c..276b4aefef 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -27,7 +27,7 @@ XSLTPROC = xsltproc --xinclude --nonet
 XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml)
 
 OTHER_FILES= \
-	$(top_srcdir)/introspection/all.xml \
+	$(top_builddir)/introspection/all.xml \
 	$(top_srcdir)/introspection/generic-types.xml \
 	$(top_srcdir)/introspection/errors.xml \
 	$(top_srcdir)/introspection/vpn-errors.xml \
@@ -37,7 +37,7 @@ OTHER_FILES= \
 GENERATED_FILES = spec.html settings-spec.xml
 
 spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
-	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_srcdir)/introspection/all.xml > $@
+	$(XSLTPROC) $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@
 	mkdir -p $(builddir)/html/
 	cp $@ $(builddir)/html/
 
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 320245eee1..7b549c1269 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
-	all.xml \
+	all.xml.in \
 	generic-types.xml \
 	errors.xml \
 	vpn-errors.xml \
diff --git a/introspection/all.xml b/introspection/all.xml.in
similarity index 98%
rename from introspection/all.xml
rename to introspection/all.xml.in
index 5d1baf01c9..4d2c272179 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml.in
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>NetworkManager D-Bus Interface Specification</tp:title>
-<tp:version>0.9</tp:version>
+<tp:version>@VERSION@</tp:version>
 
 
 <tp:copyright>Copyright (C) 2008 - 2011 Red Hat, Inc.</tp:copyright>