diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..df090ee5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+.bzr*
+.darcs*
+.git*
+.hg*
+_darcs
+B
+build*
+doxygen
+maint
+ChangeLog.cvs*
+GNUmakefile
+MMakefile
+TODO.*
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..f6a05f85
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,6 @@
+upx.1
+upx.doc
+upx.html
+upx.man
+upx.ps
+upx.tex
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..44dc52c2
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,19 @@
+*.0??
+*.d
+*.dat
+*.idb
+*.img
+*.map
+*.raw
+*.rc
+*.rel
+*.res
+*.pdb
+*.out
+*.upx
+.gdbinit
+GNUmakefile
+MMakefile
+compress_nrv.*
+upx
+version1*.h
diff --git a/src/stub/.gitignore b/src/stub/.gitignore
new file mode 100644
index 00000000..4e409bab
--- /dev/null
+++ b/src/stub/.gitignore
@@ -0,0 +1,18 @@
+.*-stamp
+*.ah
+*.asx
+*.asy
+*.bin
+*.d
+*.i
+*.lst
+*.map
+*.o
+*.out
+*.tmp
+GNUmakefile
+MMakefile
+stamp-h
+stubify.exe
+upxb
+upxd
diff --git a/src/stub/scripts/.cvsignore b/src/stub/scripts/.cvsignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/stub/util/sstrip/.gitignore b/src/stub/util/sstrip/.gitignore
new file mode 100644
index 00000000..2da519ab
--- /dev/null
+++ b/src/stub/util/sstrip/.gitignore
@@ -0,0 +1,4 @@
+amd64-linux-sstrip
+i386-linux-sstrip
+sstrip
+sstrip.exe