diff --git a/README.md b/README.md
index 67913c5f1d..e471224302 100644
--- a/README.md
+++ b/README.md
@@ -665,3 +665,13 @@ $ source path-to/fontbakery/bin/bash-completion
 ```
 
 This is particularly useful if you are running `fontbakery` in a python virtual environment, i.e. not a system-wide installation.
+
+### Font Bakery mantainence
+
+This project is currently maintained by Felipe Corrêa da Silva Sanches <juca@members.fsf.org> with very frequent contributions from Lasse Fister, Marc Foley and Dave Crossland.
+
+Releases to PyPI are performed by updating the version metadata on setup.py and then running the following commands:
+
+ python setup.py bdist_wheel
+ twine upload dist/*
+
diff --git a/setup.py b/setup.py
index 5e85f020d1..3bffd0ad65 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
     url='https://github.com/googlefonts/fontbakery/',
     description='Font Bakery is a set of command-line tools'
                 ' for testing font projects',
-    author='Font Bakery Authors',
+    author='Font Bakery Authors: Dave Crossland, Felipe Sanches, Lasse Fister, Marc Foley, Vitaly Volkov',
     author_email='dave@lab6.com',
     package_dir={'': 'Lib'},
     packages=['fontbakery'],
@@ -89,12 +89,50 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7'
     ],
-    data_files=[('data/test/cousine/',
+    data_files=[('data/test/',
+                ['data/test/README.txt']),
+                ('data/test/cabin/',
+                ['data/test/cabin/Cabin-BoldItalic.ttf',
+                 'data/test/cabin/Cabin-Bold.ttf',
+                 'data/test/cabin/CabinCondensed-Bold.ttf',
+                 'data/test/cabin/CabinCondensed-Medium.ttf',
+                 'data/test/cabin/CabinCondensed-Regular.ttf',
+                 'data/test/cabin/CabinCondensed-SemiBold.ttf',
+                 'data/test/cabin/Cabin-Italic.ttf',
+                 'data/test/cabin/Cabin-MediumItalic.ttf',
+                 'data/test/cabin/Cabin-Medium.ttf',
+                 'data/test/cabin/Cabin-Regular.ttf',
+                 'data/test/cabin/Cabin-SemiBoldItalic.ttf',
+                 'data/test/cabin/Cabin-SemiBold.ttf',
+                 'data/test/cabin/DESCRIPTION.en_us.html',
+                 'data/test/cabin/FONTLOG.txt',
+                 'data/test/cabin/METADATA.pb',
+                 'data/test/cabin/OFL.txt']),
+                ('data/test/cousine/',
                 ['data/test/cousine/Cousine-Regular.ttf',
                  'data/test/cousine/Cousine-Bold.ttf',
                  'data/test/cousine/METADATA.pb',
                  'data/test/cousine/DESCRIPTION.en_us.html',
                  'data/test/cousine/LICENSE.txt']),
+                ('data/test/familysans/',
+                ['data/test/familysans/FamilySans-BlackItalic.ttf',
+                 'data/test/familysans/FamilySans-Black.ttf',
+                 'data/test/familysans/FamilySans-BoldItalic.ttf',
+                 'data/test/familysans/FamilySans-Bold.ttf',
+                 'data/test/familysans/FamilySans-ExtraBoldItalic.ttf',
+                 'data/test/familysans/FamilySans-ExtraBold.ttf',
+                 'data/test/familysans/FamilySans-ExtraLightItalic.ttf',
+                 'data/test/familysans/FamilySans-ExtraLight.ttf',
+                 'data/test/familysans/FamilySans-Italic.ttf',
+                 'data/test/familysans/FamilySans-LightItalic.ttf',
+                 'data/test/familysans/FamilySans-Light.ttf',
+                 'data/test/familysans/FamilySans-MediumItalic.ttf',
+                 'data/test/familysans/FamilySans-Medium.ttf',
+                 'data/test/familysans/FamilySans-Regular.ttf',
+                 'data/test/familysans/FamilySans-SemiBoldItalic.ttf',
+                 'data/test/familysans/FamilySans-SemiBold.ttf',
+                 'data/test/familysans/FamilySans-ThinItalic.ttf',
+                 'data/test/familysans/FamilySans-Thin.ttf']),
                 ('data/test/mada/',
                 ['data/test/mada/Mada-Black.ttf',
                  'data/test/mada/Mada-Bold.ttf',
@@ -117,7 +155,73 @@
                  'data/test/merriweather/Merriweather-Light.ttf',
                  'data/test/merriweather/Merriweather-Regular.ttf',
                  'data/test/merriweather/METADATA.pb',
-                 'data/test/merriweather/OFL.txt'])],
+                 'data/test/merriweather/OFL.txt']),
+                ('data/test/montserrat/',
+                ['data/test/montserrat/DESCRIPTION.en_us.html',
+                 'data/test/montserrat/METADATA.pb',
+                 'data/test/montserrat/Montserrat-BlackItalic.ttf',
+                 'data/test/montserrat/Montserrat-Black.ttf',
+                 'data/test/montserrat/Montserrat-BoldItalic.ttf',
+                 'data/test/montserrat/Montserrat-Bold.ttf',
+                 'data/test/montserrat/Montserrat-ExtraBoldItalic.ttf',
+                 'data/test/montserrat/Montserrat-ExtraBold.ttf',
+                 'data/test/montserrat/Montserrat-ExtraLightItalic.ttf',
+                 'data/test/montserrat/Montserrat-ExtraLight.ttf',
+                 'data/test/montserrat/Montserrat-Italic.ttf',
+                 'data/test/montserrat/Montserrat-LightItalic.ttf',
+                 'data/test/montserrat/Montserrat-Light.ttf',
+                 'data/test/montserrat/Montserrat-MediumItalic.ttf',
+                 'data/test/montserrat/Montserrat-Medium.ttf',
+                 'data/test/montserrat/Montserrat-Regular.ttf',
+                 'data/test/montserrat/Montserrat-SemiBoldItalic.ttf',
+                 'data/test/montserrat/Montserrat-SemiBold.ttf',
+                 'data/test/montserrat/Montserrat-ThinItalic.ttf',
+                 'data/test/montserrat/Montserrat-Thin.ttf',
+                 'data/test/montserrat/OFL.txt']),
+                ('data/test/nunito/',
+                ['data/test/nunito/DESCRIPTION.en_us.html',
+                 'data/test/nunito/METADATA.pb',
+                 'data/test/nunito/Nunito-BlackItalic.ttf',
+                 'data/test/nunito/Nunito-Black.ttf',
+                 'data/test/nunito/Nunito-BoldItalic.ttf',
+                 'data/test/nunito/Nunito-Bold.ttf',
+                 'data/test/nunito/Nunito-ExtraBoldItalic.ttf',
+                 'data/test/nunito/Nunito-ExtraBold.ttf',
+                 'data/test/nunito/Nunito-ExtraLightItalic.ttf',
+                 'data/test/nunito/Nunito-ExtraLight.ttf',
+                 'data/test/nunito/Nunito-Italic.ttf',
+                 'data/test/nunito/Nunito-LightItalic.ttf',
+                 'data/test/nunito/Nunito-Light.ttf',
+                 'data/test/nunito/Nunito-Regular.ttf',
+                 'data/test/nunito/Nunito-SemiBoldItalic.ttf',
+                 'data/test/nunito/Nunito-SemiBold.ttf',
+                 'data/test/nunito/OFL.txt']),
+                ('data/test/regression/cabin/',
+                ['data/test/regression/cabin/Cabin-BoldItalic.ttf',
+                 'data/test/regression/cabin/Cabin-Bold.ttf',
+                 'data/test/regression/cabin/CabinCondensed-Bold.ttf',
+                 'data/test/regression/cabin/CabinCondensed-Medium.ttf',
+                 'data/test/regression/cabin/CabinCondensed-Regular.ttf',
+                 'data/test/regression/cabin/CabinCondensed-SemiBold.ttf',
+                 'data/test/regression/cabin/Cabin-Italic.ttf',
+                 'data/test/regression/cabin/Cabin-MediumItalic.ttf',
+                 'data/test/regression/cabin/Cabin-Medium.ttf',
+                 'data/test/regression/cabin/Cabin-Regular.ttf',
+                 'data/test/regression/cabin/Cabin-SemiBoldItalic.ttf',
+                 'data/test/regression/cabin/Cabin-SemiBold.ttf',
+                 'data/test/regression/cabin/DESCRIPTION.en_us.html',
+                 'data/test/regression/cabin/FONTLOG.txt',
+                 'data/test/regression/cabin/METADATA.pb',
+                 'data/test/regression/cabin/OFL.txt']),
+                ('data/test/028/multiple/',
+                ['data/test/028/multiple/LICENSE.txt',
+                 'data/test/028/multiple/OFL.txt']),
+                ('data/test/028/none/',
+                ['data/test/028/none/NoLicenseHere.txt']),
+                ('data/test/028/pass_apache',
+                ['data/test/028/pass_apache/LICENSE.txt']),
+                ('data/test/028/pass_ofl',
+                ['data/test/028/pass_ofl/OFL.txt'])],
     install_requires=[
         'lxml',
         'requests',