diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d88295a47d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,38 @@
+# Tell git what files are txt
+*.py  text
+*.recipe  text
+*.coffee  text
+*.js      text
+*.pot     text
+*.po      text
+*.html    text
+*.css     text
+*.htm     text
+*.rst     text
+*.md      text
+*.txt     text
+*.session text
+*.cfg     text
+*.yaml    text
+*.svg     text
+*.xml     text
+*.xsl     text
+*.tmpl    text
+*.qrc     text
+*.bat     eol=crlf
+*.sh      text
+*.xhtml   text
+
+# Tell git what files are binary
+*.zip     binary
+*.epub    binary
+*.jpg     binary
+*.jpeg    binary
+*.png     binary
+*.gif     binary
+*.pickle  binary
+*.pdf     binary
+
+# Prevent certain files from being exported:
+.gitattributes  export-ignore
+.gitignore      export-ignore
diff --git a/.bzrignore b/.gitignore
similarity index 99%
rename from .bzrignore
rename to .gitignore
index 8711782023..c610e3ba63 100644
--- a/.bzrignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 *_ui.py
+*.pyc
+*.pyo
+.bzr
 .check-cache.pickle
 src/calibre/plugins
 resources/images.qrc