diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index e7618c7b0ce..00000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,21 +0,0 @@
-.*.swp
-.bzrignore
-.idea
-.project
-.pydevproject
-.ropeproject
-.settings
-.DS_Store
-openerp/addons/*
-openerp/filestore*
-.Python
-*.pyc
-*.pyo
-bin/*
-build/
-include/
-lib/
-share/
-doc/_build/*
-win32/*.bat
-win32/meta.py
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..7828a605ef0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,30 @@
+# sphinx build directories
+_build/
+
+# dotfiles
+.*
+!.gitignore
+# compiled python files
+*.py[co]
+# setup.py egg_info
+*.egg-info
+# emacs backup files
+*~
+# hg stuff
+*.orig
+status
+# odoo filestore
+openerp/filestore
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
+
+# various virtualenv
+/bin/
+/build/
+/dist/
+/include/
+/lib/
+/man/
+/share/
+/src/