diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..cf523590f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,28 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.cpp text
+*.gdh text
+*.gdl text
+*.h text
+*.json text
+*.log text
+*.md text
+*.sh text
+*.svg text
+*.txt text
+*.ttf binary
+*.xml text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+
+# Files to exclude from git archive
+.gitattributes export-ignore
+.gitignore export-ignore
+
+# Exclude the font sources in the test/fonts dir
+src/graphite2/tests/fonts/*/ export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..6ac948574
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+*~
+*.bak
+m4
+autom4te.cache
+config
+configure
+config.status
+config.log
+aclocal.m4
+libtool
+Makefile.in
+Makefile
+*.o
+*.lo
+*.Plo
+*.swp
+*.la
+*.kdev4
+*.orig
+*.pyc
+*.egg-info
+.vscode
+*.code-workspace
+.settings
+.tags
+.tags_swap
+.libs/
+.deps/
+.externalToolBuilders
+src/graphite2/build*/**
+builddir/**
\ No newline at end of file