diff --git a/.gitignore b/.gitignore
index a06659f0..c9c64902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,22 +2,32 @@
 *.go
 *~
 .#*
+*.0-M1
+*.0-guile
+*.0-hex2
 *.E
-*.log
+*.M1
 *.gcc
 *.guile
-*.0-guile
+*.hex2
+*.hex2-o
+*.log
+*.log
+*.mini-M1
 *.mini-guile
+*.mini-hex2
 *.mlibc-gcc
 *.mlibc-o
-*.hex2-o
-#*.M1
+!/stage0/*
+!/stage0/*.c
+/stage0/exit-42.*
 
 /src/*.h
 /src/*.i
 
 *.o
 /.config.make
+/.store
 /.tarball-version
 /ChangeLog
 /a.out
diff --git a/GNUmakefile b/GNUmakefile
index aaf1d20d..2a8601c9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
 GUILE:=guile
-GUILE_FLAGS:=--no-auto-compile -L guile -C guile
+GUILE_FLAGS:=--no-auto-compile -L . -L guile -C . -C guile
 
 include .config.make