diff --git a/Makefile.am b/Makefile.am
index cc1e3e13..300f9606 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/build/autotools/common.am
 SUBDIRS = build src tutorial test tools games people doc
 DIST_SUBDIRS = $(SUBDIRS) binaries
 
-EXTRA_DIST = bootstrap COPYING TODO
+EXTRA_DIST += bootstrap COPYING TODO
 AUTOMAKE_OPTIONS = dist-bzip2
 ACLOCAL_AMFLAGS = -I build/autotools/m4
 
diff --git a/build/Makefile.am b/build/Makefile.am
index d4c09cee..5d284872 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,12 +1,12 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = lol-build \
-             check-source.sh run-bitten.sh \
-             build-linux build-mingw build-mingw64 build-ps3 \
-             build-nacl32 build-nacl64 \
-             \
-             autotools/common.am
+EXTRA_DIST += lol-build \
+              check-source.sh run-bitten.sh \
+              build-linux build-mingw build-mingw64 build-ps3 \
+              build-nacl32 build-nacl64 \
+              \
+              autotools/common.am
 
 TESTS = check-source.sh
 
diff --git a/build/autotools/common.am b/build/autotools/common.am
index 555a5369..96ee22f3 100644
--- a/build/autotools/common.am
+++ b/build/autotools/common.am
@@ -5,6 +5,7 @@
 
 CLEANFILES =
 SUFFIXES =
+EXTRA_DIST =
 
 
 #
@@ -104,5 +105,9 @@ CLEANFILES += $(PROGRAMS:%$(EXEEXT)=%.exe) \
 # Additional rules
 #
 
+EXTRA_DIST += $(foreach p, $(noinst_PROGRAMS), $($(p)_DATA))
+EXTRA_DIST += $(foreach p, $(bin_PROGRAMS), $($(p)_DATA))
+
+
 .PHONY: bench lolcheck generated
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1ca2a2a7..499cbc83 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = doxygen.cfg.in doxygen.css footer.html header.html \
-             $(man_MANS) $(doxygen_DOX)
+EXTRA_DIST += doxygen.cfg.in doxygen.css footer.html header.html \
+              $(man_MANS) $(doxygen_DOX)
 CLEANFILES += doxygen.log stamp-latex stamp-doxygen
 
 doxygen_DOX = lolengine.dox
diff --git a/src/Makefile.am b/src/Makefile.am
index 667aa14b..6bd42829 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,8 @@ liblolcore_a_SOURCES = \
     $(android_sources)
 liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua
 
-EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
-             gpu/lolfx-scanner.l gpu/lolfx-parser.y
+EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \
+              gpu/lolfx-scanner.l gpu/lolfx-parser.y
 
 liblolcore_headers = \
     lol/base/all.h \
@@ -37,8 +37,7 @@ liblolcore_headers = \
     \
     lol/math/all.h \
     lol/math/functions.h lol/math/vector.h lol/math/half.h lol/math/real.h \
-    lol/math/remez.h lol/math/math.h lol/math/geometry.h lol/math/interp.h \
-    lol/math/rand.h \
+    lol/math/remez.h lol/math/geometry.h lol/math/interp.h lol/math/rand.h \
     \
     lol/sys/all.h \
     lol/sys/init.h lol/sys/file.h lol/sys/thread.h lol/sys/atomic.h \
@@ -52,7 +51,7 @@ liblolcore_headers = \
     lol/gpu/framebuffer.h lol/gpu/texture.h lol/gpu/lolfx.h \
     \
     lol/debug/all.h \
-    lol/debug/line.h \
+    lol/debug/lines.h \
     \
     lol/unit.h
 
diff --git a/src/data/font/Makefile.am b/src/data/font/Makefile.am
index 3036c54c..b26286ad 100644
--- a/src/data/font/Makefile.am
+++ b/src/data/font/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = ascii.png
+EXTRA_DIST += ascii.png
 
 if USE_CACA
 all: ascii.png
diff --git a/test/Makefile.am b/test/Makefile.am
index f7bf40e5..6b21786c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,8 +6,6 @@ SUBDIRS = math sandbox xolotl
 bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)
 
-EXTRA_DIST = data/gradient.png
-
 noinst_PROGRAMS = benchsuite $(testsuite) btphystest meshviewer
 
 TESTS = $(testsuite)
@@ -25,6 +23,7 @@ testsuite_SOURCES = testsuite.cpp \
     unit/rand.cpp
 testsuite_CPPFLAGS = $(AM_CPPFLAGS)
 testsuite_DEPENDENCIES = @LOL_DEPS@
+noinst_DATA = data/gradient.png
 
 benchsuite_SOURCES = benchsuite.cpp \
     benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \
diff --git a/test/math/Makefile.am b/test/math/Makefile.am
index 53904f78..7e3dafca 100644
--- a/test/math/Makefile.am
+++ b/test/math/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
+EXTRA_DIST += NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
 
 noinst_PROGRAMS = pi poly remez
 
diff --git a/test/sandbox/Makefile.am b/test/sandbox/Makefile.am
index ceb51d70..83e43d8d 100644
--- a/test/sandbox/Makefile.am
+++ b/test/sandbox/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-noinst_PROGRAMS = sample
+bin_PROGRAMS = sample
 
 sample_SOURCES = sample.cpp
 sample_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/test/xolotl/Makefile.am b/test/xolotl/Makefile.am
index 2455c259..7cb80f4a 100644
--- a/test/xolotl/Makefile.am
+++ b/test/xolotl/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-noinst_PROGRAMS = xolotl
+bin_PROGRAMS = xolotl
 
 xolotl_SOURCES = xolotl.cpp xolotl.h
 xolotl_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tools/vimlol/Makefile.am b/tools/vimlol/Makefile.am
index 514532d0..b1ea5223 100644
--- a/tools/vimlol/Makefile.am
+++ b/tools/vimlol/Makefile.am
@@ -1,6 +1,6 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = \
+EXTRA_DIST += \
     vimlol.vim
 
diff --git a/tools/vslol/Makefile.am b/tools/vslol/Makefile.am
index 8ada2600..a92ff29a 100644
--- a/tools/vslol/Makefile.am
+++ b/tools/vslol/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-EXTRA_DIST = \
+EXTRA_DIST += \
     VsLol.csproj \
     \
     VsLol.cs \