diff --git a/.gitignore b/.gitignore
index fecf9b28..43b67a24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,14 @@ bin_unix/native_client
 bin_unix/native_server
 config/history
 config/init.cfg
-config/saved.cfg
+config/saved*.cfg
 config/servers.cfg
 config/configtemplates.zip
 config/mapmodelattributes.cfg
+packages/maps/*.cfg
+packages/maps/!new_content.cfg
+packages/maps/*.cgz
+packages/maps/!new_content.cgz
 packages/misc/checksums_md5.txt
 source/codeblocks/AssaultCube.layout
 source/codeblocks/AssaultCube_Linux.layout
@@ -27,3 +31,5 @@ source/src/cube.h.gch
 source/src/Makefile_local
 clientlog*.txt
 dumpmapconfig.txt
+packetlog.txt
+
diff --git a/bin_unix/.gitignore b/bin_unix/.gitignore
index e69de29b..d22300e1 100644
--- a/bin_unix/.gitignore
+++ b/bin_unix/.gitignore
@@ -0,0 +1,4 @@
+# ignore everything except .gitignore
+*
+!.gitignore
+
diff --git a/demos/.gitignore b/demos/.gitignore
index e69de29b..d22300e1 100644
--- a/demos/.gitignore
+++ b/demos/.gitignore
@@ -0,0 +1,4 @@
+# ignore everything except .gitignore
+*
+!.gitignore
+
diff --git a/packages/maps/servermaps/incoming/.gitignore b/packages/maps/servermaps/incoming/.gitignore
index e69de29b..d22300e1 100644
--- a/packages/maps/servermaps/incoming/.gitignore
+++ b/packages/maps/servermaps/incoming/.gitignore
@@ -0,0 +1,4 @@
+# ignore everything except .gitignore
+*
+!.gitignore
+
diff --git a/screenshots/.gitignore b/screenshots/.gitignore
index e69de29b..d22300e1 100644
--- a/screenshots/.gitignore
+++ b/screenshots/.gitignore
@@ -0,0 +1,4 @@
+# ignore everything except .gitignore
+*
+!.gitignore
+