diff --git a/.gitignore b/.gitignore
index ef02d5628c..ac8d17cb3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,17 @@
+# Temp files
 *~
 *.swp
-/INSTALL
-.deps/
-.libs/
-/aclocal.m4
-/autom4te.cache
-/config.guess
-/config.h.in
-/json_config.h
-/compile
-/config.h
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/doc
-/install-sh
-/json.pc
-/json-c.pc
-/json-c-uninstalled.pc
-/libtool
-/ltmain.sh
-/Makefile
-/Makefile.in
-/missing
-/stamp-h1
-/stamp-h2
+*.bak
+*.backup
+\#*
+.\#*
+*\#
+*.sav
+*.save
+*.autosav
+*.autosave
+
+# Tests
 /test-driver
 /tests/Makefile
 /tests/Makefile.in
@@ -51,11 +36,62 @@
 /tests/*.vg.out
 /tests/*.log
 /tests/*.trs
+
+# Generated folders
 /Debug
 /Release
 /*/Debug
 /*/Release
+
+# Generated binaries
 *.lo
 *.o
 /libjson-c.la
 /libjson.la
+
+# Archives
+*.zip
+*.tar.*
+*.tgz
+*.gz
+*.bz2
+*.xz
+*.lz
+*.lzma
+*.7z
+*.dll
+*.deb
+*.rpm
+*.apk
+*.exe
+*.msi
+*.dmg
+*.ipa
+
+/INSTALL
+.deps/
+.libs/
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.h.in
+/json_config.h
+/compile
+/config.h
+/config.log
+/config.status
+/config.sub
+/configure
+/depcomp
+/doc
+/install-sh
+/json.pc
+/json-c.pc
+/json-c-uninstalled.pc
+/libtool
+/ltmain.sh
+/Makefile
+/Makefile.in
+/missing
+/stamp-h1
+/stamp-h2