diff --git a/libgsmhr/Makefile.am b/libgsmhr/Makefile.am
index e6d246d..f36d759 100644
--- a/libgsmhr/Makefile.am
+++ b/libgsmhr/Makefile.am
@@ -1,7 +1,10 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS = -fPIC -Wall ${SYMBOL_VISIBILITY}
 
-EXTRA_DIST=fetch_sources.py
+EXTRA_DIST = \
+	fetch_sources.py \
+	patches \
+	$(NULL)
 
 LIBVERSION=0:0:0
 
@@ -22,4 +25,7 @@ libgsmhr_la_SOURCES = $(REFSRC_SRC) libgsmhr.c
 libgsmhr_la_LIBADD = -ldl
 
 clean-local:
-	-rm -rf ${REFSRC_PATH}/*.{c,h} ${REFSRC_PATH}/.downloaded
+	-rm -rf ${REFSRC_PATH}/*.lo
+
+distclean-local:
+	-rm -rf ${REFSRC_PATH}/
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f7c4be..dee4060 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,7 +79,7 @@ EXTRA_DIST += \
 	io/pq_file_test.ok \
 	io/pq_rtp_test.ok \
 	io/io_sample.txt \
-	ref-files/* \
+	ref-files \
 	$(NULL)
 
 DISTCLEANFILES = atconfig atlocal
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 5946661..1edd077 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -12,7 +12,7 @@ AT_KEYWORDS([pq_file])
 cat $abs_srcdir/io/pq_file_test.ok > expout
 AT_CHECK([
 	$abs_top_builddir/tests/io/pq_file_test \
-		$abs_top_builddir/tests/io/io_sample.txt],
+		$abs_srcdir/io/io_sample.txt],
 	[0], [expout])
 AT_CLEANUP