diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index 2ec3d2f9..28dc05ad 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -119,6 +119,7 @@ packages="
  unzip
  xsltproc
  yasm
+ yamllint
  zip
  zlib1g:i386
 "
diff --git a/setup.py b/setup.py
index 40abdb19..bade76bb 100755
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,7 @@ setup(name='fdroidserver',
           'qrcode',
           'ruamel.yaml >= 0.15',
           'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+          'yamllint',
       ],
       classifiers=[
           'Development Status :: 4 - Beta',