diff --git a/Makefile b/Makefile
index 9f81cf06..e140d383 100644
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,7 @@ test:
 test-remote:
 	$(helper) $@
 
-pep8:
+pycodestyle pep8:
 	$(helper) $@
 
 shellcheck-global-explorers:
diff --git a/bin/build-helper b/bin/build-helper
index 02fa67d6..2179a5ed 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -249,7 +249,7 @@ eof
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
-        "$0" check-pep8
+        "$0" check-pycodestyle
         "$0" shellcheck
 
         # Generate version file to be included in packaging
@@ -365,13 +365,13 @@ eof
         python3 -m cdist.test.exec.remote
     ;;
 
-    pep8)
-        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
+    pycodestyle|pep8)
+        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
 
-    check-pep8)
-        "$0" pep8
-        printf "\\nPlease review pep8 report.\\n"
+    check-pycodestyle)
+        "$0" pycodestyle
+        printf "\\nPlease review pycodestyle report.\\n"
         while true
         do
             echo "Continue (yes/no)?"
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index 081feb54..a2b8dde7 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -284,7 +284,7 @@ eof
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
-        "$0" check-pep8
+        "$0" check-pycodestyle
         "$0" shellcheck
 
         # Generate version file to be included in packaging
@@ -427,13 +427,13 @@ eof
         python3 -m cdist.test.exec.remote
     ;;
 
-    pep8)
-        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
+    pycodestyle|pep8)
+        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
 
-    check-pep8)
-        "$0" pep8
-        printf "\\nPlease review pep8 report.\\n"
+    check-pycodestyle)
+        "$0" pycodestyle
+        printf "\\nPlease review pycodestyle report.\\n"
         while true
         do
             echo "Continue (yes/no)?"
diff --git a/docs/changelog b/docs/changelog
index 437731bd..0695a4a0 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,6 +1,9 @@
 Changelog
 ---------
 
+next:
+	* Build: Migrate from pep8 to pycodestyle (Darko Poljak)
+
 4.10.6: 2019-02-15
 	* Type __prometheus_alertmanager: Add startup flag (Dominique Roux)
 	* Types __zypper_repo, __zypper_service: Re-add the use of echo in explorers (Daniel Heule)