diff --git a/.gitignore b/.gitignore
index f80512e..25a842b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,6 @@
 build
 .msg
 .rebase-*
+*~
+*.loT
+
diff --git a/bgpd/.gitignore b/bgpd/.gitignore
index f4504f6..122e2c5 100644
--- a/bgpd/.gitignore
+++ b/bgpd/.gitignore
@@ -13,3 +13,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/doc/.gitignore b/doc/.gitignore
index 43987b2..dfd50c6 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -29,3 +29,6 @@
 *.vr
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/doc/mpls/.gitignore b/doc/mpls/.gitignore
index 1218df9..b0a4a46 100644
--- a/doc/mpls/.gitignore
+++ b/doc/mpls/.gitignore
@@ -1,2 +1,5 @@
 .arch-ids
 .arch-inventory
+*~
+*.loT
+
diff --git a/guile/.gitignore b/guile/.gitignore
index d345fc3..5c2e06b 100644
--- a/guile/.gitignore
+++ b/guile/.gitignore
@@ -5,3 +5,6 @@
 .nfs*
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/init/.gitignore b/init/.gitignore
index 3c447f5..30b4bc9 100644
--- a/init/.gitignore
+++ b/init/.gitignore
@@ -1,3 +1,6 @@
 Makefile
 Makefile.in
 .nfs*
+*~
+*.loT
+
diff --git a/isisd/.gitignore b/isisd/.gitignore
index 26aa85c..21b4e69 100644
--- a/isisd/.gitignore
+++ b/isisd/.gitignore
@@ -10,3 +10,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/isisd/include-netbsd/.gitignore b/isisd/include-netbsd/.gitignore
index 73bcf19..dd5bf7c 100644
--- a/isisd/include-netbsd/.gitignore
+++ b/isisd/include-netbsd/.gitignore
@@ -1,3 +1,6 @@
 .arch-inventory
 .arch-ids
 
+*~
+*.loT
+
diff --git a/isisd/topology/.gitignore b/isisd/topology/.gitignore
index b0ae823..dd75c27 100644
--- a/isisd/topology/.gitignore
+++ b/isisd/topology/.gitignore
@@ -7,3 +7,6 @@
 .nfs*
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/lib/.gitignore b/lib/.gitignore
index b578b9d..00af85a 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -10,3 +10,7 @@
 .libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+memtypes.h
+route_types.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 2f02fdb..3f3bd0a 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -2,3 +2,6 @@
 Makefile.in
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ospf6d/.gitignore b/ospf6d/.gitignore
index 522397a..d64e01e 100644
--- a/ospf6d/.gitignore
+++ b/ospf6d/.gitignore
@@ -13,3 +13,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ospfclient/.gitignore b/ospfclient/.gitignore
index d6de29a..191322b 100644
--- a/ospfclient/.gitignore
+++ b/ospfclient/.gitignore
@@ -11,3 +11,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ospfd/.gitignore b/ospfd/.gitignore
index 6fce629..f7d6f09 100644
--- a/ospfd/.gitignore
+++ b/ospfd/.gitignore
@@ -12,3 +12,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/pkgsrc/.gitignore b/pkgsrc/.gitignore
index 818bd17..63e9a66 100644
--- a/pkgsrc/.gitignore
+++ b/pkgsrc/.gitignore
@@ -3,3 +3,6 @@
 *.sh
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ports/.gitignore b/ports/.gitignore
index 73bcf19..dd5bf7c 100644
--- a/ports/.gitignore
+++ b/ports/.gitignore
@@ -1,3 +1,6 @@
 .arch-inventory
 .arch-ids
 
+*~
+*.loT
+
diff --git a/ports/files/.gitignore b/ports/files/.gitignore
index 73bcf19..dd5bf7c 100644
--- a/ports/files/.gitignore
+++ b/ports/files/.gitignore
@@ -1,3 +1,6 @@
 .arch-inventory
 .arch-ids
 
+*~
+*.loT
+
diff --git a/ports/pkg/.gitignore b/ports/pkg/.gitignore
index 73bcf19..dd5bf7c 100644
--- a/ports/pkg/.gitignore
+++ b/ports/pkg/.gitignore
@@ -1,3 +1,6 @@
 .arch-inventory
 .arch-ids
 
+*~
+*.loT
+
diff --git a/redhat/.gitignore b/redhat/.gitignore
index 98ca65a..e399bd8 100644
--- a/redhat/.gitignore
+++ b/redhat/.gitignore
@@ -5,3 +5,6 @@
 .nfs*
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ripd/.gitignore b/ripd/.gitignore
index 41fd8c8..510124a 100644
--- a/ripd/.gitignore
+++ b/ripd/.gitignore
@@ -12,3 +12,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/ripngd/.gitignore b/ripngd/.gitignore
index 48f45ce..dc57967 100644
--- a/ripngd/.gitignore
+++ b/ripngd/.gitignore
@@ -12,3 +12,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/solaris/.gitignore b/solaris/.gitignore
index 810874c..daf234a 100644
--- a/solaris/.gitignore
+++ b/solaris/.gitignore
@@ -12,3 +12,6 @@
 quagga.init
 *.pkg
 *.pkg.gz
+*~
+*.loT
+
diff --git a/tests/.gitignore b/tests/.gitignore
index 4c4801e..ca08594 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -14,3 +14,6 @@
 testbuffer
 testmemory
 testsig
+*~
+*.loT
+
diff --git a/tools/.gitignore b/tools/.gitignore
index 73bcf19..dd5bf7c 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1,6 @@
 .arch-inventory
 .arch-ids
 
+*~
+*.loT
+
diff --git a/vtysh/.gitignore b/vtysh/.gitignore
index ed3f1f3..5856eac 100644
--- a/vtysh/.gitignore
+++ b/vtysh/.gitignore
@@ -11,3 +11,6 @@
 .libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/watchquagga/.gitignore b/watchquagga/.gitignore
index c661510..b6226d5 100644
--- a/watchquagga/.gitignore
+++ b/watchquagga/.gitignore
@@ -11,3 +11,6 @@
 *.libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+
diff --git a/zebra/.gitignore b/zebra/.gitignore
index 59c5889..41d0647 100644
--- a/zebra/.gitignore
+++ b/zebra/.gitignore
@@ -11,3 +11,6 @@
 .libs
 .arch-inventory
 .arch-ids
+*~
+*.loT
+