diff --git a/scripts/dev/run-pychecker.py b/scripts/dev/run-pylint.py
similarity index 55%
rename from scripts/dev/run-pychecker.py
rename to scripts/dev/run-pylint.py
index b4728b441..c840d8b48 100755
--- a/scripts/dev/run-pychecker.py
+++ b/scripts/dev/run-pylint.py
@@ -7,8 +7,7 @@ import sys
 if os.getcwd().endswith('dev'):
 	os.chdir('../../src/') # we were in scripts/dev
 
-os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log')
-os.system('$EDITOR /tmp/pychecker-gajim.log')
+os.system("pylint --indent-string='\t' --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:]))
 
 
 # vim: se ts=3: