diff --git a/configure.ac b/configure.ac
index 9f7335fc1..deadaae92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,8 @@
-AC_INIT(virt-manager.spec.in)
-AM_INIT_AUTOMAKE(virt-manager, 0.5.4)
+
+AC_INIT(virt-manager, 0.5.4)
+AC_CONFIG_SRCDIR(src/virt-manager.py.in)
+dnl Make automake keep quiet about wildcards & other GNUmake-isms
+AM_INIT_AUTOMAKE([-Wno-portability])
 
 ALL_LINGUAS="bg bn_IN bs ca cs da de es fi fr gu hi hr hu is it ja kn ko ml mr ms nb nl or pa pl pt_BR pt ro ru sr@latin sr sv ta te tr uk zh_CN zh_TW"
 IT_PROG_INTLTOOL([0.35.0], [no-xml])
diff --git a/src/Makefile.am b/src/Makefile.am
index 35a32e8f0..250e10d40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,34 +1,34 @@
 
 SUBDIRS = graphWidgets virtManager
 
-bin_SOURCES = virt-manager.in
+bin_SCRIPTS_IN = virt-manager.in
 bin_SCRIPTS = virt-manager
 
 pythondir = $(pkgdatadir)
-python_SOURCES = $(PACKAGE).py.in
+python_DATA_IN = $(PACKAGE).py.in
 python_DATA = $(PACKAGE).py
 
-libexec_SOURCES = $(PACKAGE)-launch.in
+libexec_DATA_IN = $(PACKAGE)-launch.in
 libexec_SCRIPTS = $(PACKAGE)-launch
 
 gladedir = $(pkgdatadir)
 glade_DATA = $(wildcard $(srcdir)/*.glade)
 
 desktopdir = $(datadir)/applications
-desktop_SOURCES = $(PACKAGE).desktop.in.in
+desktop_DATA_IN = $(PACKAGE).desktop.in.in
 desktop_DATA = $(PACKAGE).desktop
 
 dbusdir = $(datadir)/dbus-1/services
-dbus_SOURCES = $(PACKAGE).service.in
+dbus_DATA_IN = $(PACKAGE).service.in
 dbus_DATA = $(PACKAGE).service
 
 schemadir = $(sysconfdir)/gconf/schemas
-schema_SOURCES = $(PACKAGE).schemas.in
+schema_DATA_IN = $(PACKAGE).schemas.in
 schema_DATA = $(PACKAGE).schemas
 
 CLEANFILES = $(bin_SCRIPTS) $(desktop_DATA) $(dbus_DATA) $(python_DATA)  $(libexec_SCRIPTS) $(schema_DATA) $(PACKAGE).desktop.in
 
-EXTRA_DIST = $(bin_SOURCES) $(desktop_SOURCES) $(dbus_SOURCES) $(python_SOURCES) $(glade_DATA) $(libexec_SOURCES) $(schema_SOURCES)
+EXTRA_DIST = $(bin_SCRIPTS_IN) $(desktop_DATA_IN) $(dbus_DATA_IN) $(python_DATA_IN) $(glade_DATA) $(libexec_DATA_IN) $(schema_DATA_IN)
 
 @INTLTOOL_DESKTOP_RULE@