diff --git a/bin/build-helper b/bin/build-helper
index 8f228697..b2d3b66e 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -166,6 +166,7 @@ eof
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
+        "$0" pep8
 
         # Generate version file to be included in packaging
         "$0" version
@@ -268,6 +269,28 @@ eof
         fi
     ;;
 
+    pep8)
+        pep8 ${basedir} | less
+        echo "Please review pep8 report."
+        while true
+        do
+            echo "Continue (yes/no)?"
+            any=
+            read any
+            case "$any" in
+                yes)
+                    break
+                ;;
+                no)
+                    exit 1
+                ;;
+                *)
+                    echo "Please answer with 'yes' or 'no' explicitly."
+                ;;
+        esac
+        done
+    ;;
+
     version-branch)
         "$0" changelog-version | cut -d. -f '1,2'
     ;;
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index 5d0f92a2..4c30575a 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -201,6 +201,7 @@ eof
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
+        "$0" pep8
 
         # Generate version file to be included in packaging
         "$0" version
@@ -328,6 +329,28 @@ eof
         fi
     ;;
 
+    pep8)
+        pep8 ${basedir} | less
+        echo "Please review pep8 report."
+        while true
+        do
+            echo "Continue (yes/no)?"
+            any=
+            read any
+            case "$any" in
+                yes)
+                    break
+                ;;
+                no)
+                    exit 1
+                ;;
+                *)
+                    echo "Please answer with 'yes' or 'no' explicitly."
+                ;;
+        esac
+        done
+    ;;
+
     version-branch)
         "$0" changelog-version | cut -d. -f '1,2'
     ;;