diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..f33056d5a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.app
+*.o
+*.so
+*.pyc
+build
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+*.dblite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# Xcode generated files #
+######################
+# Note: committing these is optional
+*.mode1v3
+*.pbxuser
\ No newline at end of file
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8b1dbc68e..8fa708a5b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20130406
 --------
 d1x-rebirth.xcodeproj/project.pbxproj, editor/ehostage.c, main/custom.c: Updated Xcode project, changed references to error.h to dxxerror.h, since it was renamed
+.gitignore: Added .gitignore
 
 20130405
 --------