diff --git a/.gitignore b/.gitignore
index d9f648c..4a33632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,24 @@
-# Object files
-*.o
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
+# Compiled source #
+###################
+*.com
+*.class
 *.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
 *.exe
-*.out
-*.app
-
-# Build directories & generated files
-.deps
-.libs
-Makefile
-config.h
-config.log
-config.status
-libtool
-
+*.o
+*.so
+ 
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+ 
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db