diff --git a/!MkClean,fd7 b/!MkClean,fd7
index 56276796ac0170ed7877767786eddc6e95d21a19..aa5e15cc606a6c06e5e230da385148c8174bc186 100644
--- a/!MkClean,fd7
+++ b/!MkClean,fd7
@@ -14,3 +14,4 @@
 |
 Dir <Obey$Dir>
 amu_machine clean
+stripdepnd
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..cb7746135dcd2165bcff974544681dda308aa668
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/Squish,ffb
+/crunched/
+/Makefile.d
+/o/
+/objs/
diff --git a/bas/Keep b/Keep
similarity index 100%
rename from bas/Keep
rename to Keep
diff --git a/Makefile b/Makefile
index b55eed0031c790014d64256e2491c5683bdc47a1..29c5a4cedf2d53dde5c2240bcc0b03f9010c0013 100644
--- a/Makefile
+++ b/Makefile
@@ -13,52 +13,11 @@
 # limitations under the License.
 #
 # Makefile for Squish
-#
-
-#
-# Program specific options:
-#
-COMPONENT  = Squish
-MSGVERSION = ${AWK} -f Build:AwkVers
-
-include StdTools
-
-SQFLAGS = -nolist
-
-FILES  =\
- squished.${COMPONENT}
-
-#
-# Generic build rules:
-#
-all: ${FILES}
-	@${ECHO} ${COMPONENT}: all build complete
-
-install: ${FILES}
-	 ${CP} squished.${COMPONENT} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	 @${ECHO} ${COMPONENT}: installed
-
-clean:
-	${XWIPE} squished ${WFLAGS}
-	${XWIPE} crunched ${WFLAGS}
-	${XWIPE} n ${WFLAGS}
-	@${ECHO} ${COMPONENT}: cleaned
-
-#
-# Static dependencies:
-#
-	             
-squished.${COMPONENT}: crunched.${COMPONENT} bas.Keep
-	${MKDIR} squished
-	${SQUISH} ${SQFLAGS} -keep bas.Keep -from crunched.${COMPONENT} -to $@
 
-crunched.${COMPONENT}: n.${COMPONENT}
-	${MKDIR} crunched
-	crunch.${COMPONENT}; BASIC
+COMPONENT         ?= Squish
+SQUISHFLAGS        = -keep Keep
+SOURCES_TO_SYMLINK = Keep
 
-n.${COMPONENT}: bas.${COMPONENT}
-	${MKDIR} n
-	${NUMBER} bas.${COMPONENT} $@
+include BasicApp
 
-#---------------------------------------------------------------------------
 # Dynamic dependencies: