diff --git a/ChangeLog b/ChangeLog
index b65011aa4..5985a8bbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-03 Paulo Andrade <pcpa@gnu.org>
+
+	* configure.ac, check/Makefile.am, check/check.sh,
+	doc/Makefile.am, include/lightning/Makefile.am,
+	lib/Makefile.am: Correct make distcheck.
+
 2012-12-02 Paulo Andrade <pcpa@gnu.org>
 
 	* lib/jit_ppc.c: Assign copyright ownership to FSF.
diff --git a/check/Makefile.am b/check/Makefile.am
index bb4ec40b5..6445b6e88 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST =				\
 	divi.tst	divi.ok		\
 	fib.tst		fib.ok		\
 	rpn.tst		rpn.ok		\
-	check.sh			\
+	check.sh	run-test	\
 	all.tst
 
 TESTS = 3to2 add allocai bp divi fib rpn
@@ -41,7 +41,7 @@ CLEANFILES = $(TESTS)
 
 # Not so pretty but good for a prototype
 $(TESTS):	check.sh
-	$(LN_S) check.sh $@
+	$(LN_S) $(srcdir)/check.sh $@
 
 TESTS_ENVIRONMENT=$(srcdir)/run-test
 
diff --git a/check/check.sh b/check/check.sh
index 54e48c618..edf1f21ff 100755
--- a/check/check.sh
+++ b/check/check.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./lightning `basename $0`
+./lightning $srcdir/`basename $0`.tst
diff --git a/check/run-test b/check/run-test
index 931abc7bc..288be5b39 100755
--- a/check/run-test
+++ b/check/run-test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-./lightning $1.tst | tr -d \\r > $1.log
+$1 | tr -d \\r > $1.log
 if cmp -s $srcdir/$1.ok $1.log; then
   rm $1.log
 else
diff --git a/configure.ac b/configure.ac
index 1d8dd3ef2..bac8e0508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,13 +58,19 @@ fi
 
 cpu=
 case "$target_cpu" in
-    i?x86|x86_64)	cpu=x86	;;
-    *)				;;
+    i?x86|x86_64)	cpu=x86		;;
+    *arm*)		cpu=arm		;;
+    *mips*)		cpu=mips	;;
+    *ppc*)		cpu=ppc		;;
+    *)					;;
 esac
 if test x$cpu = x; then
     AC_MSG_ERROR([cpu $target_cpu not supported])
 fi
-AM_CONDITIONAL(cpu_x86, [test cpu-$cpu = cpu-x86])
+AM_CONDITIONAL(cpu_arm,  [test cpu-$cpu = cpu-arm])
+AM_CONDITIONAL(cpu_mips, [test cpu-$cpu = cpu-mips])
+AM_CONDITIONAL(cpu_ppc,  [test cpu-$cpu = cpu-ppc])
+AM_CONDITIONAL(cpu_x86,  [test cpu-$cpu = cpu-x86])
 
 AC_SUBST([LIGHTNING_CFLAGS])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b53a4aa9f..3baca2d69 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,3 @@
-TEXI2DVI=$(top_srcdir)/m4/texi2dvi
-HELP2MAN = $(top_srcdir)/m4/help2man
-
 info_TEXINFOS = lightning.texi 
 EXTRA_TEXINFOS = u-lightning.texi p-lightning.texi
 MOSTLYCLEANFILES = lightning.tmp
diff --git a/include/lightning/Makefile.am b/include/lightning/Makefile.am
index ab5b2f311..94aadcd48 100644
--- a/include/lightning/Makefile.am
+++ b/include/lightning/Makefile.am
@@ -12,12 +12,24 @@
 # GNU General Public License for more details.
 #
 
-includedir = $(includedir)/lightning
+lightning_includedir = $(includedir)/lightning
 
 EXTRA_DIST =		\
 	jit_private.h
 
+if cpu_arm
+lightning_include_HEADERS = 	\
+	jit_arm.h
+endif
+if cpu_mips
+lightning_include_HEADERS = 	\
+	jit_mips.h
+endif
+if cpu_ppc
+lightning_include_HEADERS = 	\
+	jit_ppc.h
+endif
 if cpu_x86
-include_HEADERS = 	\
+lightning_include_HEADERS = 	\
 	jit_x86.h
 endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c4464cd41..2b2837706 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST =			\
 	jit_arm.c		\
 	jit_arm-cpu.c		\
 	jit_arm-swf.c		\
-	jit_x86-vfp.c		\
+	jit_arm-vfp.c		\
 	jit_mips.c		\
 	jit_mips-cpu.c		\
 	jit_mips-fpu.c		\