diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..7655014e5
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,7 @@
+BasedOnStyle: Google
+Language: Proto
+UseTab: ForIndentation
+IndentWidth: 4
+TabWidth: 4
+ColumnLimit: 0
+AlignTrailingComments: true
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b0b08cc55..7e391bda0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,11 @@
 language: python
+addons:
+  apt:
+    sources:
+      - llvm-toolchain-precise-3.8
+      - ubuntu-toolchain-r-test
+    packages:
+      - clang-format-3.8
 python:
   - "2.7"
 install:
@@ -9,3 +16,5 @@ install:
   - export PATH=/tmp/bin:$PATH
 script:
   - ./compile.py python
+  - clang-format-3.8 -i -style file $(find src -name "*.proto")
+  - git diff --exit-code
\ No newline at end of file