diff --git a/.gitignore b/.gitignore
index 84eee03c30..c21202f71d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,46 @@
-Makefile*
 bin/*
-bundle/*
-!bin/data/chars.grf
+!bin/ai
+bin/ai/*
+!bin/ai/compat*.nut
+!bin/ai/regression
+!bin/data
+bin/data/*
 !bin/data/openttdd.grf
 !bin/data/openttdw.grf
-!bin/data/opntitle.grf
-!bin/scenario/README
-!bin/scripts*
-config.*
+!bin/data/opntitle.dat
+!bin/data/orig_*.obg
+!bin/data/orig_*.obs
+!bin/data/no_sound.obs
+!bin/gm
+bin/gm/*
+!bin/gm/no_music.obm
+!bin/gm/orig_*.obm
+!bin/scripts
+bin/scripts/*
+!bin/scripts/*.example
+!bin/scripts/readme.txt
+
+bundle/*
+bundles/*
+docs/aidocs/*
+docs/source/*
+media/openttd.desktop
+media/openttd.desktop.install
 objs/*
+projects/Debug
+projects/Release
+projects/*.ncb
+projects/*.suo
+projects/*.sdf
+projects/*.opensdf
+projects/*.vcproj.*.user
+projects/*.vcxproj.user
 src/rev.cpp
 src/os/windows/ottdres.rc
+
+/Makefile*
+!/Makefile.msvc
+/config.*
+!/config.lib
+!*.in
+*.tmp
diff --git a/.hgignore b/.hgignore
index 5ea0fd0f52..c644225965 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,12 +1,25 @@
+syntax: glob
+
 bin/lang/*
-bin/opentd*
+bin/openttd*
+bin/*.cfg
 bundle/*
+bundles/*
 config.cache.*
 config.log
 config.pwd
+docs/aidocs/*
+docs/source/*
 Makefile
 Makefile.am
-media/openttd.desktop*
+media/openttd.desktop
+media/openttd.desktop.install
 objs/*
+projects/*.ncb
+projects/*.suo
+projects/*.sdf
+projects/*.opensdf
+projects/*.vcproj.*.user
+projects/*.vcxproj.user
 src/rev.cpp
 src/os/windows/ottdres.rc