diff --git a/Makefile.am b/Makefile.am
index e5674d2b..ae39af39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,8 +138,9 @@ plist_xml_strings.h: plists/get_info_response.xml
 	echo "// Do not edit!" > plist_xml_strings.h
 	echo "// This file is automatically generated from files in the plists folder." >> plist_xml_strings.h
 	echo "" >> plist_xml_strings.h
-	xxd -i plists/get_info_response.xml >> plist_xml_strings.h
+	xxd -i $< >> plist_xml_strings.h
 	echo "" >> plist_xml_strings.h
+	sed -e 's/[^ ]*plists_get_info_response_xml/plists_get_info_response_xml/g' -i plist_xml_strings.h
 plist_xml_strings.c: plist_xml_strings.h
 	touch plist_xml_strings.c
 
@@ -161,7 +162,7 @@ noinst_HEADERS += $(BUILT_SOURCES)
 CLEANFILES += $(BUILT_SOURCES)
 
 dbus-interface.c:  org.gnome.ShairportSync.xml
-	gdbus-codegen --interface-prefix org.gnome --generate-c-code dbus-interface org.gnome.ShairportSync.xml
+	gdbus-codegen --interface-prefix org.gnome --generate-c-code dbus-interface $<
 dbus-interface.h: dbus-interface.c
 	touch dbus-interface.h
 endif
@@ -178,7 +179,7 @@ noinst_HEADERS += $(BUILT_SOURCES)
 CLEANFILES += $(BUILT_SOURCES)
 
 mpris-interface.c:  org.mpris.MediaPlayer2.xml
-	gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-interface org.mpris.MediaPlayer2.xml
+	gdbus-codegen --interface-prefix org.mpris --generate-c-code mpris-interface $<
 mpris-interface.h: mpris-interface.c
 	touch mpris-interface.h
 endif
diff --git a/configure.ac b/configure.ac
index 356d3d4c..3b55a109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,10 @@ AC_CONFIG_HEADERS([config.h])
 AC_PROG_RANLIB
 
 AC_CHECK_PROGS([GIT], [git])
-if test -n "$GIT" && test -e ".git/index" ; then
+if test -n "$GIT" && test -e "$srcdir/.git/index" ; then
   AC_DEFINE([CONFIG_USE_GIT_VERSION_STRING], 1, [Use the version string produced by running 'git describe --dirty'.])
 fi
-AM_CONDITIONAL([USE_GIT_VERSION], [test -n "$GIT" && test -e ".git/index" ])
+AM_CONDITIONAL([USE_GIT_VERSION], [test -n "$GIT" && test -e "$srcdir/.git/index" ])
 
 # Derived from the Avahi configure.ac file
 # Specifying the OS type, defaulting to linux.