diff --git a/.gitignore b/.gitignore
index bb33d39a..716ebec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,8 +41,6 @@ win32/Release
 win32/*.vcxproj.user
 win32/*.sdf
 win32/*.suo
-# Android cruft
-monsterz/android/assets
 # Do not exclude anything in contrib; this is currently one level
 # more than our current max
 !contrib/*
@@ -53,9 +51,6 @@ monsterz/android/assets
 !contrib/*/*/*/*/*/*
 !contrib/*/*/*/*/*/*/*
 # Our binaries
-deushax/deushax
-deushax/editor
-monsterz/monsterz
 test/testsuite
 test/tutorial/tut01
 test/tutorial/tut02
diff --git a/Makefile.am b/Makefile.am
index 53b005b0..892ad894 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 
-SUBDIRS = src test deushax monsterz tools gfx
+SUBDIRS = src test tools gfx
+SUBDIRS += deushax
+SUBDIRS += monsterz
+SUBDIRS += mrpigeon
 DIST_SUBDIRS = $(SUBDIRS)
 
 EXTRA_DIST = bootstrap build-linux build-mingw build-mingw64 build-ps3 \
diff --git a/configure.ac b/configure.ac
index 92363970..801ff818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,6 +358,9 @@ AC_CONFIG_FILES(
   deushax/gfx/Makefile
   deushax/maps/Makefile
 ])
+AC_CONFIG_FILES(
+ [mrpigeon/Makefile
+])
 
 AC_OUTPUT