diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19793f1..a464a2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,8 @@ pep8:
     image: python:3.5
     stage: lint
     script:
-        - pip install pep8
-        - pep8 --config=setup.cfg --count .
+        - pip install pycodestyle
+        - pycodestyle --config=setup.cfg --count .
 
 eslint:
     image: node:7.10.0
diff --git a/requirements.txt b/requirements.txt
index ef7a2fd..fd6fbdf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ nose-exclude==0.5.0
 psycopg2==2.7.1
 django-bootstrap3==8.2.3
 django-tables2==1.6.1
-pep8==1.7.0
+pycodestyle-2.3.1
 dealer==2.0.5
 django-modeltranslation==0.12.1
 django-auditlog==0.4.3
diff --git a/setup.cfg b/setup.cfg
index c6a7425..5101f60 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,4 @@
-[pep8]
+[pycodestyle]
 max-line-length = 120
 ignore = E501,E722
 exclude = '*/migrations/*'
diff --git a/webapp/tables.py b/webapp/tables.py
index 2aff309..540a5a8 100644
--- a/webapp/tables.py
+++ b/webapp/tables.py
@@ -17,4 +17,4 @@ class KaehmyExportTable(tables.Table):
     has_any_board_role = tables.BooleanColumn(verbose_name=_('Applied for board'))
 
     def __init__(self, *args, **kwargs):
-        super(KaehmyExportTable, self).__init__(*args, **kwargs)
\ No newline at end of file
+        super(KaehmyExportTable, self).__init__(*args, **kwargs)