diff --git a/Makefile.am b/Makefile.am
index 50bd44a..24cbf90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS_TEST = test
 endif
 
 SUBDIRS = src data doc $(SUBDIRS_TEST)
+DIST_SUBDIRS = src data doc
 
 CLEANFILES = $(PACKAGE).spec
 
diff --git a/configure.ac b/configure.ac
index 239b6df..825b23f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,9 +256,9 @@ data/Makefile
 data/fonts/Makefile
 data/images/Makefile
 doc/Makefile
-test/Makefile
 README
 ])
+AM_COND_IF([SRC_IS_GIT], [ AC_CONFIG_FILES([test/Makefile]) ])
 AC_OUTPUT
 
 #####################################################################