diff --git a/.gitignore b/.gitignore
index 4bc9796ec..d113ba9fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ libtool
 *.patch
 *.o
 *~
-#*#
+\#*#
 .*
 !.gitignore
 *.bak
@@ -18,3 +18,6 @@ libtool
 stdout
 *.lo
 *.la
+*.orig
+*.rej
+*.old
diff --git a/iface/nips/.gitignore b/iface/nips/.gitignore
index 4610696ae..259a1e64e 100644
--- a/iface/nips/.gitignore
+++ b/iface/nips/.gitignore
@@ -1,2 +1,3 @@
-*.lo
 TAGS
+dottynips
+empt_check
diff --git a/iface/nips/nips_vm/.gitignore b/iface/nips/nips_vm/.gitignore
new file mode 100644
index 000000000..d67677fe6
--- /dev/null
+++ b/iface/nips/nips_vm/.gitignore
@@ -0,0 +1 @@
+nipsvm
diff --git a/src/eltlparse/.gitignore b/src/eltlparse/.gitignore
new file mode 100644
index 000000000..9f03c8c07
--- /dev/null
+++ b/src/eltlparse/.gitignore
@@ -0,0 +1,7 @@
+eltlparse.cc
+eltlparse.hh
+*.output
+eltlscan.cc
+location.hh
+position.hh
+stack.hh
diff --git a/src/eltltest/.gitignore b/src/eltltest/.gitignore
new file mode 100644
index 000000000..ef6565fb4
--- /dev/null
+++ b/src/eltltest/.gitignore
@@ -0,0 +1 @@
+defs
diff --git a/src/sanity/.gitignore b/src/sanity/.gitignore
index 3dda72986..67e8759f7 100644
--- a/src/sanity/.gitignore
+++ b/src/sanity/.gitignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+incltest.cc