diff --git a/mkp/__init__.py b/mkp/__init__.py
index 47586881528efb5d99ded55aa142cf54d4af6f12..9a152b3d00c086b946733774d23ee8d4f2a15a86 100644
--- a/mkp/__init__.py
+++ b/mkp/__init__.py
@@ -28,6 +28,7 @@ def dist(info, path=None):
         path = os.path.dirname(os.path.realpath(main.__file__))
 
     info['files'] = find_files(path)
+    info['num_files'] = sum(len(file_list) for file_list in info['files'].values())
     dist_dir = os.path.join(path, _DIST_DIR)
     filename = '{}-{}.mkp'.format(info['name'], info['version'])
 
diff --git a/test/integration/test_mkp.py b/test/integration/test_mkp.py
index 7aee28219ccc3ed7713cc5f7ba451d7f623a14f0..90c3e7749d084ce2db80f8a73595c6fb6fdc4b9b 100644
--- a/test/integration/test_mkp.py
+++ b/test/integration/test_mkp.py
@@ -137,6 +137,8 @@ def test_dist(tmpdir):
         'author': 'John Doe',
         'name': 'foo',
         'version': '42',
+        'version.min_required': '1.2.6p5',
+        'version.usable_until': None,
     }
 
     mkp.dist(info, str(tmpdir))
@@ -147,8 +149,11 @@ def test_dist(tmpdir):
     assert package.info['name'] == 'foo'
     assert package.info['files']['agents'] == ['special/agent_test']
     assert package.info['files']['checks'] == ['foo']
+    assert package.info['num_files'] == 2
     assert package.info['version'] == '42'
     assert package.info['version.packaged'] == 'python-mkp'
+    assert package.info['version.min_required'] == '1.2.6p5'
+    assert package.info['version.usable_until'] is None
 
 
 def test_dist_uses_script_path_when_no_path_is_given(tmpdir):
@@ -179,3 +184,4 @@ dist({
     assert package.info['files']['checks'] == ['foo']
     assert package.info['version'] == '42'
     assert package.info['version.packaged'] == 'python-mkp'
+    assert package.info['num_files'] == 2
\ No newline at end of file