diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index ac1d7410..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-GNUmakefile
-aclocal.m4
-autom4te.cache
-bin
-config.h
-config.h.in
-config.log
-config.status
-configure
-data
-info.html
-info.nr
-lib
-sources.mk
-stamp-h
-stamp-h.in
-subjects.mk
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..255b01d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,66 @@
+# Generated files, keep in sync with Make.mk
+# $(clean)
+*.[ado]
+src/util/empsched
+src/util/fairland
+src/util/files
+src/util/pconfig
+src/client/empire
+src/server/emp_server
+info/Combat.t
+info/Commerce.t
+info/Commodities.t
+info/Communication.t
+info/Deity.t
+info/Detection.t
+info/Diplomacy.t
+info/Distribution.t
+info/Introduction.t
+info/LandUnits.t
+info/Loans.t
+info/Maps.t
+info/Nations.t
+info/Nukes.t
+info/Obsolete.t
+info/Occupation.t
+info/Planes.t
+info/Playing.t
+info/Populace.t
+info/Producing.t
+info/Sectors.t
+info/Server.t
+info/Ships.t
+info/Transportation.t
+info/Updates.t
+info/TOP.t
+# $(distclean)
+config.h
+config.log
+config.status
+info.html
+info.nr
+lib
+stamp-h
+GNUmakefile
+src/client/Makefile
+src/client/ipglob.c
+src/lib/global/path.c
+autom4te.cache
+src/client/autom4te.cache
+subjects.mk
+# $(src_distgen)
+aclocal.m4
+config.h.in
+configure
+stamp-h.in
+# $(bld_distgen)
+sources.mk
+# $(cli_distgen)
+src/client/aclocal.m4
+src/client/config.h.in
+src/client/configure
+
+# Generic junk
+*.orig
+*.rej
+*~
diff --git a/info/.cvsignore b/info/.cvsignore
deleted file mode 100644
index 86afb5de..00000000
--- a/info/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-Combat.t
-Commerce.t
-Commodities.t
-Communication.t
-Deity.t
-Detection.t
-Diplomacy.t
-Distribution.t
-Introduction.t
-LandUnits.t
-Loans.t
-Maps.t
-Missions.t
-Nations.t
-Nukes.t
-Obsolete.t
-Occupation.t
-Planes.t
-Playing.t
-Populace.t
-Producing.t
-Sectors.t
-Server.t
-Ships.t
-TOP.t
-Transportation.t
-Updates.t
-stamp
diff --git a/src/client/.cvsignore b/src/client/.cvsignore
deleted file mode 100644
index 96a981cd..00000000
--- a/src/client/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-aclocal.m4
-autom4te.cache
-config.h.in
-configure
-empire
-ipglob.c
diff --git a/src/lib/global/.cvsignore b/src/lib/global/.cvsignore
deleted file mode 100644
index 3f4f82b4..00000000
--- a/src/lib/global/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-path.c
diff --git a/src/scripts/nightly/.gitignore b/src/scripts/nightly/.gitignore
new file mode 100644
index 00000000..33df9809
--- /dev/null
+++ b/src/scripts/nightly/.gitignore
@@ -0,0 +1,2 @@
+boxes
+logs
diff --git a/src/scripts/nightly/boxes/.cvsignore b/src/scripts/nightly/boxes/.cvsignore
deleted file mode 100644
index 72e8ffc0..00000000
--- a/src/scripts/nightly/boxes/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/src/scripts/nightly/logs/.cvsignore b/src/scripts/nightly/logs/.cvsignore
deleted file mode 100644
index 72e8ffc0..00000000
--- a/src/scripts/nightly/logs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/src/server/.cvsignore b/src/server/.cvsignore
deleted file mode 100644
index 11dd7514..00000000
--- a/src/server/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-emp_server
diff --git a/src/util/.cvsignore b/src/util/.cvsignore
deleted file mode 100644
index fbd88af8..00000000
--- a/src/util/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-empsched
-fairland
-files
-pconfig