diff --git a/.travis.yml b/.travis.yml
index 94f9b6c..c4c740e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - 3.4
 
 before_script:
-  - "pep8 --ignore=E501 --exclude=logbook.py,utils.py ogn"
+  - flake8 tests ogn
 
 script:
   - nosetests --with-coverage --cover-package=ogn
diff --git a/requirements.txt b/requirements.txt
index 72a3314..25060bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 nose==1.3.7
 coveralls==0.4.4
-pep8==1.6.2
+flake8==2.5.0
 SQLAlchemy==1.0.8
 geopy==1.11.0
 manage.py==0.2.10
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..e44b810
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501