diff --git a/.cvsignore b/.cvsignore
index f6dc6df..d285509 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,6 +7,7 @@
 ltmain.sh
 stamp-h
 stamp-h[0-9]*
+*-stamp
 Makefile
 .deps
 autom4te*.cache
@@ -19,3 +20,6 @@
 quagga-[0-9.][0-9.][0-9.]*.tar.gz
 .nfs*
 libtool
+.arch-inventory
+.arch-ids
+{arch}
diff --git a/bgpd/.cvsignore b/bgpd/.cvsignore
index 4800fc5..f4504f6 100644
--- a/bgpd/.cvsignore
+++ b/bgpd/.cvsignore
@@ -11,3 +11,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 8283653..ed7665b 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -22,3 +22,5 @@
 *.toc
 *.tp
 *.vr
+.arch-inventory
+.arch-ids
diff --git a/doc/mpls/.cvsignore b/doc/mpls/.cvsignore
new file mode 100644
index 0000000..1218df9
--- /dev/null
+++ b/doc/mpls/.cvsignore
@@ -0,0 +1,2 @@
+.arch-ids
+.arch-inventory
diff --git a/guile/.cvsignore b/guile/.cvsignore
index f120482..d345fc3 100644
--- a/guile/.cvsignore
+++ b/guile/.cvsignore
@@ -3,3 +3,5 @@
 zebra-guile
 Makefile.in
 .nfs*
+.arch-inventory
+.arch-ids
diff --git a/isisd/.cvsignore b/isisd/.cvsignore
index 254617b..26aa85c 100644
--- a/isisd/.cvsignore
+++ b/isisd/.cvsignore
@@ -8,3 +8,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/isisd/include-netbsd/.cvsignore b/isisd/include-netbsd/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/isisd/include-netbsd/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/isisd/modified/.cvsignore b/isisd/modified/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/isisd/modified/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/isisd/topology/.cvsignore b/isisd/topology/.cvsignore
index bf4f60a..b0ae823 100644
--- a/isisd/topology/.cvsignore
+++ b/isisd/topology/.cvsignore
@@ -5,3 +5,5 @@
 TAGS
 .deps
 .nfs*
+.arch-inventory
+.arch-ids
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 1a5cd48..b578b9d 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -8,3 +8,5 @@
 .deps
 .nfs*
 .libs
+.arch-inventory
+.arch-ids
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 282522d..2f02fdb 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+.arch-inventory
+.arch-ids
diff --git a/ospf6d/.cvsignore b/ospf6d/.cvsignore
index b014176..522397a 100644
--- a/ospf6d/.cvsignore
+++ b/ospf6d/.cvsignore
@@ -11,3 +11,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/ospfclient/.cvsignore b/ospfclient/.cvsignore
index e02fdb0..d6de29a 100644
--- a/ospfclient/.cvsignore
+++ b/ospfclient/.cvsignore
@@ -9,3 +9,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/ospfd/.cvsignore b/ospfd/.cvsignore
index ff2737b..6fce629 100644
--- a/ospfd/.cvsignore
+++ b/ospfd/.cvsignore
@@ -10,3 +10,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/pkgsrc/.cvsignore b/pkgsrc/.cvsignore
index a889514..818bd17 100644
--- a/pkgsrc/.cvsignore
+++ b/pkgsrc/.cvsignore
@@ -1,3 +1,5 @@
 Makefile
 Makefile.in
 *.sh
+.arch-inventory
+.arch-ids
diff --git a/ports/.cvsignore b/ports/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/ports/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/ports/files/.cvsignore b/ports/files/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/ports/files/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/ports/pkg/.cvsignore b/ports/pkg/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/ports/pkg/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/redhat/.cvsignore b/redhat/.cvsignore
index 50216fa..98ca65a 100644
--- a/redhat/.cvsignore
+++ b/redhat/.cvsignore
@@ -3,3 +3,5 @@
 Makefile
 Makefile.in
 .nfs*
+.arch-inventory
+.arch-ids
diff --git a/ripd/.cvsignore b/ripd/.cvsignore
index 1ee4eac..41fd8c8 100644
--- a/ripd/.cvsignore
+++ b/ripd/.cvsignore
@@ -10,3 +10,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/ripngd/.cvsignore b/ripngd/.cvsignore
index a405af8..48f45ce 100644
--- a/ripngd/.cvsignore
+++ b/ripngd/.cvsignore
@@ -10,3 +10,5 @@
 *.lo
 *.la
 *.libs
+.arch-inventory
+.arch-ids
diff --git a/tests/.cvsignore b/tests/.cvsignore
index 78f0e8b..9e39876 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -9,3 +9,5 @@
 *.la
 *.libs
 testsig
+.arch-inventory
+.arch-ids
diff --git a/tools/.cvsignore b/tools/.cvsignore
new file mode 100644
index 0000000..73bcf19
--- /dev/null
+++ b/tools/.cvsignore
@@ -0,0 +1,3 @@
+.arch-inventory
+.arch-ids
+
diff --git a/vtysh/.cvsignore b/vtysh/.cvsignore
index ab2bdd5..ed3f1f3 100644
--- a/vtysh/.cvsignore
+++ b/vtysh/.cvsignore
@@ -9,3 +9,5 @@
 .nfs*
 extract.pl
 .libs
+.arch-inventory
+.arch-ids
diff --git a/zebra/.cvsignore b/zebra/.cvsignore
index 8e4509e..59c5889 100644
--- a/zebra/.cvsignore
+++ b/zebra/.cvsignore
@@ -9,3 +9,5 @@
 .deps
 .nfs*
 .libs
+.arch-inventory
+.arch-ids