diff --git a/ANNOUNCE b/ANNOUNCE
index 9eeb97b11..e0ce89eb1 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -148,6 +148,12 @@ Version 1.7.0alpha11 [February 8, 2013]
     png_fixed and the gamma code specific version of the same to avoid floor(),
     which may be a library function (not an intrinsic). Removed unused #if 0
     code.
+  Fixed make distcheck to skip over the test result files. They were
+    being included because the whole of the 'tests' directory is included,
+    fixed to just include the actual test files and tests/pngstest.  Also
+    reverted the previous erroneous change to remove the ${srcdir} from the
+    front of contrib, scripts, projects and added an explanation of what is
+    going on to Makefile.am
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 4f327da96..2c86b6ad5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4434,6 +4434,12 @@ Version 1.7.0alpha11 [February 8, 2013]
     png_fixed and the gamma code specific version of the same to avoid floor(),
     which may be a library function (not an intrinsic). Removed unused #if 0
     code.
+  Fixed make distcheck to skip over the test result files. They were
+    being included because the whole of the 'tests' directory is included,
+    fixed to just include the actual test files and tests/pngstest.  Also
+    reverted the previous erroneous change to remove the ${srcdir} from the
+    front of contrib, scripts, projects and added an explanation of what is
+    going on to Makefile.am
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/Makefile.am b/Makefile.am
index d0441efe3..34d9bc94b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,11 +97,14 @@ nodist_pkginclude_HEADERS= pnglibconf.h
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
 
-#extra source distribution files.
+# Extra source distribution files, '${srcdir}' is used below to stop build files
+# from those directories being included.  This only works if the configure is
+# not done in the source directory!
 EXTRA_DIST= \
 	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
 	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
-	contrib projects scripts tests \
+	${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
+	$(TESTS) $(XFAIL_TESTS) tests/pngstest \
 	CMakeLists.txt example.c libpng-manual.txt
 
 SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn