diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..a773f8e3e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+# Directory for creating releases
+release
+# Configuration files
+config.inc.php
+config.header.inc.php
+config.footer.inc.php
+# Upload/save dirs
+upload
+save
+# For setup script
+config
+# ctags
+tags
+# Editor files
+phpmyadmin.wpj
+.projectOptions
+.vimrc
+.project
+.settings
+.buildpath
+.cache
+.idea
+*.sw[op]
+# Locales
+locale
+# Backups
+*~
+# Javascript sources
+sources
+# API documentation
+apidoc
diff --git a/themes/.gitignore b/themes/.gitignore
new file mode 100644
index 000000000..55144c027
--- /dev/null
+++ b/themes/.gitignore
@@ -0,0 +1,29 @@
+aqua
+aqua_brushed
+arctic_ocean
+cactica_blues
+clearview3
+crimson_gray
+dark_lime
+darkblue_gray
+garvblue
+graphivore
+green_orange
+grid
+hillside
+openphpnuke
+original_small
+paradice
+pixeline
+pmahomme
+silk
+silkline
+smooth_yellow
+very_small
+xampp
+xp_basic
+xp_blue
+xp_dirty
+xp_green
+xp_silver
+programmersdarkside