diff --git a/bootstrap.sh b/bootstrap.sh
index 92535fc..5723c1c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-
-subdirs=" if"
-
 ./cleanup.sh
 
 autoscan || exit 1
@@ -17,13 +14,3 @@
 
 autoconf
 automake -ac --add-missing --foreign || exit 1
-
-for subdir in ${subdirs}; do
-    if [ -x "${subdir}/bootstrap.sh" ]; then
-      cwd="`pwd`"
-      cd "${subdir}"
-      ./bootstrap.sh
-      cd "${cwd}"
-    fi
-done
-
diff --git a/cleanup.sh b/cleanup.sh
index 0f2cc70..d6b6df7 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
+topsrcdir="`dirname $0`"
+cd "$topsrcdir"
+
 make distclean >/dev/null 2>&1
+find . -name Makefile.in -exec rm -f {} \;
 rm -rf \
 AUTHORS \
 ChangeLog \
@@ -28,12 +32,4 @@
 ltmain.sh \
 missing \
 ylwrap \
-if/gen-* \
-compiler/cpp/Makefile.in \
-if/Makefile.in \
-lib/Makefile.in \
-lib/cpp/Makefile.in \
-lib/py/Makefile.in \
-lib/csharp/Makefile.in \
-test/Makefile.in \
-test/py/Makefile.in
+if/gen-*