diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 147d9bca41bdc0652467cdbe9b2bff2602d94f41..0000000000000000000000000000000000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,25 +0,0 @@
-ABOUT-NLS
-COPYING
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-confdefs.h
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-config.rpath
-configure
-config.guess
-config.sub
-depcomp
-install-sh
-missing
-mkinstalldirs
-nano.spec
-stamp-h
-stamp-h.in
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..21b165de128afa6aaff2580dc30fe3e467f74363
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+
+/ABOUT-NLS
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.log
+/config.h
+/config.h.in
+/config.rpath
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/missing
+/mkinstalldirs
+/stamp-h1
+
+/nano.spec
+/src/nano
diff --git a/ChangeLog b/ChangeLog
index cf3b26eb16fa08be6c12f09f6b4f2f31b0d69f79..c130f545f2f5230bba545fa3aae939038980a776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-17  Mike Frysinger <vapier@gentoo.org>
+	 * */.gitignore - Git ignore files for those running a local git
+	   against SVN.
+
 2008-03-16  Benno Schulenberg <bensberg@justemail.net>
 	* src/help.c, src/global.  - Fix help strings no longer being 
 	  translated properly.
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 38d4a518e042babe0926e0c845e068165957327b..0000000000000000000000000000000000000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-nanorc.sample
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..a2acc8dd5b281ad46e165edb44bdc11b1fa7e025
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+/nanorc.sample
diff --git a/doc/man/.cvsignore b/doc/man/.gitignore
similarity index 65%
rename from doc/man/.cvsignore
rename to doc/man/.gitignore
index ac2dd23a5460b7fd5a95b5f43b5031dd1df542d8..97e8d5b323328727f7aa52d6192edb5d787a0eaf 100644
--- a/doc/man/.cvsignore
+++ b/doc/man/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 nano.1.html
 nanorc.5.html
 rnano.1.html
diff --git a/doc/man/fr/.cvsignore b/doc/man/fr/.cvsignore
deleted file mode 100644
index ac2dd23a5460b7fd5a95b5f43b5031dd1df542d8..0000000000000000000000000000000000000000
--- a/doc/man/fr/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-nano.1.html
-nanorc.5.html
-rnano.1.html
diff --git a/doc/syntax/.cvsignore b/doc/syntax/.cvsignore
deleted file mode 100644
index 282522db0342d8750454b3dc162493b5fc709cc8..0000000000000000000000000000000000000000
--- a/doc/syntax/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/texinfo/.cvsignore b/doc/texinfo/.gitignore
similarity index 60%
rename from doc/texinfo/.cvsignore
rename to doc/texinfo/.gitignore
index f6bd99e95672b0f17926c2ad331cb5c189b99905..9fa0ed4854ec889fd162fc8863e176c1763a5034 100644
--- a/doc/texinfo/.cvsignore
+++ b/doc/texinfo/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
-nano.info
-nano.html
 texinfo.tex
+nano.html
+nano.info
diff --git a/m4/.cvsignore b/m4/.cvsignore
deleted file mode 100644
index 3dda72986fc5af262451a760393b3a7065938c80..0000000000000000000000000000000000000000
--- a/m4/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index a2104e366ef2b4515b61db76c30d02f75974f57e..0000000000000000000000000000000000000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-POTFILES
-Rules-quot
-boldquot.sed
-cat-id*
-en@boldquot.header
-en@quot.header
-insert-header.sin
-messages
-messages.mo
-nano.pot
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-cat*
-quot.sed
-*.gmo
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4936124263472f32c5e06b036adbdac5f5757db8
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,11 @@
+/*.gmo
+
+/Makefile.in.in
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/insert-header.sin
+/POTFILES
+/quot.sed
+/remove-potcdate.sin
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 96f29cf03be3c5d324ee336b1b7e5e5ae8c78ea1..0000000000000000000000000000000000000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-nano
-.deps