diff --git a/.pylint-rcfile b/.pylint-rcfile
index 8cc4c8d8..d32d90c4 100644
--- a/.pylint-rcfile
+++ b/.pylint-rcfile
@@ -43,3 +43,5 @@ good-names=i,j,k,ex,Run,f,fp
 # Maximum number of nested blocks for function / method body
 max-nested-blocks=5
 
+[FORMAT]
+max-line-length=88
diff --git a/setup.cfg b/setup.cfg
index 81bcf8af..67e7581d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,3 +39,11 @@ output_dir = locale
 [compile_catalog]
 domain = fdroidserver
 directory = locale
+
+[pycodestyle]
+ignore = E203,W503
+max-line-length = 88
+
+[flake8]
+ignore = E203,W503
+max-line-length = 88