diff --git a/.gitlint b/.gitlint
index 5fc27db1f5..6c320ed335 100644
--- a/.gitlint
+++ b/.gitlint
@@ -1,7 +1,7 @@
 [general]
 ignore=title-trailing-punctuation, body-min-length, body-is-missing
 
-extra-path=tools/lib/gitlint-rules
+extra-path=tools/lib/gitlint-rules.py
 
 [title-match-regex]
 regex=^.+\.$
diff --git a/requirements/dev.txt b/requirements/dev.txt
index b6b12c0588..253b862d41 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -22,7 +22,7 @@ pyflakes==1.5.0
 tblib==1.3.2
 
 # Needed to lint Git commit messages
-gitlint==0.8.1
+gitlint==0.8.2
 
 # Needed for gitlint
 arrow==0.10.0
diff --git a/tools/lib/gitlint-rules/rules.py b/tools/lib/gitlint-rules.py
similarity index 100%
rename from tools/lib/gitlint-rules/rules.py
rename to tools/lib/gitlint-rules.py