diff --git a/.gitignore b/.gitignore
index d32c37e..6e4dfce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 tags
 cscope.*
 em
+emlink
+intsize
 magrst
 magsav
 mtread
@@ -14,6 +16,7 @@ ptextu
 showdrive
 smad
 smag
+strip8
 time
 untap
 untap16
diff --git a/makefile b/makefile
index 214d47c..74a37eb 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 # makefile to create various emulator builds
 
-REV=${shell hg id -n}
+REV=${shell [ -d .hg ] && hg id -n || git rev-parse --short HEAD}
 
 .PHONY:	em emwarn debug trace fixed
 
diff --git a/util/makefile b/util/makefile
index fd19c85..a48b4dd 100644
--- a/util/makefile
+++ b/util/makefile
@@ -1,12 +1,8 @@
+default:	emlink intsize magrst magsav mtread mtwrite ptextu strip8 \
+			untap untap16 untap_vin utextp
 
+# Unix version of Prime's magrst
+magrst: magrst.c istext.c
 
-magrst: # Unix version of Prime's magrst
-
-	rm -rf magrst.o
-	cc -o magrst magrst.c istext.c
-
-
-magsav: # Unix version of Prime's magsav
-
-	rm -rf magsav.o
-	cc -o magsav magsav.c istext.c
+# Unix version of Prime's magsav
+magsav: magsav.c istext.c