diff --git a/.gitignore b/.gitignore
index cd4b69d496f..11e612e9853 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,19 @@
-/vendors
-/app/Vendor
-/app/composer*
-/lib
-/.project
-/.settings
-/.buildpath
-.DS_Store
-/.htaccess
-/app/Vendor
-/app/composer*
-/README
-/app/tmp/GPG*
-/app/tmp/sessions/sess_*
-/app/tmp/logs/*.log
-/app/tmp/cache/models/myapp*
-/app/tmp/cache/persistent/myapp*
-/app/tmp/cache/views/myapp*
-/app/files/*
-!/app/files/empty
-!/app/files/scripts/
-/app/files/scripts/python-stix/
-/app/files/scripts/python-cybox/
-/app/files/scripts/*.pyc
-/app/files/scripts/*.py~
-/app/files/scripts/mispzmq/*
-!/app/files/scripts/mispzmq/mispzmq.py
-!/app/files/scripts/mispzmq/mispzmqtest.py
-/app/files/scripts/tmp/*
-!/app/files/scripts/tmp/empty
-/app/tmp/files/*
-!/app/files/empty
-/app/files/terms/*
-!/app/files/terms/empty
-/app/webroot/img/logo.png
-/app/webroot/img/custom/*
-!/app/webroot/img/custom/empty
-/app/webroot/img/orgs/*
-!/app/webroot/img/orgs/ADMIN.png
-!/app/webroot/img/orgs/MIL.be.png
-!/app/webroot/img/orgs/MISP.png
-!/app/webroot/img/orgs/NATO.png
-!/app/webroot/img/orgs/NCIRC.png
-/app/Config/bootstrap.php
-/app/Config/database.php
-/app/Config/core.php
-/app/Config/config.php
-/app/Lib/cakephp
-/app/webroot/gpg.asc
-/app/tmp/logs
-*.swp
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+[Oo]bj/ # FlashDevelop obj
+[Bb]in/ # FlashDevelop bin
+
+# Other files and folders
+.settings/
+
+# Executables
+*.swf
+*.air
+*.ipa
+*.apk
+
+# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
+# should NOT be excluded as they contain compiler settings and other important
+# information for Eclipse / Flash Builder.