diff --git a/.gitignore b/.gitignore
index ef02d56..ac8d17c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,73 @@
+# Temp files
 *~
 *.swp
+*.bak
+*.backup
+\#*
+.\#*
+*\#
+*.sav
+*.save
+*.autosav
+*.autosave
+
+# Tests
+/test-driver
+/tests/Makefile
+/tests/Makefile.in
+/tests/test1
+/tests/test1Formatted
+/tests/test2
+/tests/test2Formatted
+/tests/test4
+/tests/testReplaceExisting
+/tests/testSubDir
+/tests/test_parse_int64
+/tests/test_parse
+/tests/test_cast
+/tests/test_charcase
+/tests/test_double_serializer
+/tests/test_locale
+/tests/test_null
+/tests/test_printbuf
+/tests/test_set_serializer
+/tests/test_compare
+/tests/test_util_file
+/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/
@@ -27,35 +95,3 @@
 /missing
 /stamp-h1
 /stamp-h2
-/test-driver
-/tests/Makefile
-/tests/Makefile.in
-/tests/test1
-/tests/test1Formatted
-/tests/test2
-/tests/test2Formatted
-/tests/test4
-/tests/testReplaceExisting
-/tests/testSubDir
-/tests/test_parse_int64
-/tests/test_parse
-/tests/test_cast
-/tests/test_charcase
-/tests/test_double_serializer
-/tests/test_locale
-/tests/test_null
-/tests/test_printbuf
-/tests/test_set_serializer
-/tests/test_compare
-/tests/test_util_file
-/tests/*.vg.out
-/tests/*.log
-/tests/*.trs
-/Debug
-/Release
-/*/Debug
-/*/Release
-*.lo
-*.o
-/libjson-c.la
-/libjson.la