diff -r 4383ff47fffa Lib/shutil.py
--- a/Lib/shutil.py	Sun Sep 06 18:34:22 2015 +0300
+++ b/Lib/shutil.py	Sun Sep 06 18:45:33 2015 +0300
@@ -679,8 +679,17 @@ def _make_zipfile(base_name, base_dir, v
     if not dry_run:
         with zipfile.ZipFile(zip_filename, "w",
                              compression=zipfile.ZIP_DEFLATED) as zf:
+            path = os.path.normpath(base_dir)
+            zf.write(path, path)
+            if logger is not None:
+                logger.info("adding '%s'", path)
             for dirpath, dirnames, filenames in os.walk(base_dir):
-                for name in filenames:
+                for name in sorted(dirnames):
+                    path = os.path.normpath(os.path.join(dirpath, name))
+                    zf.write(path, path)
+                    if logger is not None:
+                        logger.info("adding '%s'", path)
+                for name in sorted(filenames):
                     path = os.path.normpath(os.path.join(dirpath, name))
                     if os.path.isfile(path):
                         zf.write(path, path)
diff -r 4383ff47fffa Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py	Sun Sep 06 18:34:22 2015 +0300
+++ b/Lib/test/test_shutil.py	Sun Sep 06 18:45:33 2015 +0300
@@ -1060,14 +1060,15 @@ class TestShutil(unittest.TestCase):
         # creating something to zip
         root_dir, base_dir = self._create_files()
         base_name = os.path.join(self.mkdtemp(), 'archive')
-        res = make_archive(base_name, 'zip', root_dir, 'dist')
+        res = make_archive(base_name, 'zip', root_dir, base_dir)
 
         self.assertEqual(res, base_name + '.zip')
         self.assertTrue(os.path.isfile(res))
         self.assertTrue(zipfile.is_zipfile(res))
         with zipfile.ZipFile(res) as zf:
             self.assertCountEqual(zf.namelist(),
-                    ['dist/file1', 'dist/file2', 'dist/sub/file3'])
+                    ['dist/', 'dist/sub/', 'dist/sub2/',
+                     'dist/file1', 'dist/file2', 'dist/sub/file3'])
 
 
     def test_make_archive(self):
@@ -1181,11 +1182,9 @@ class TestShutil(unittest.TestCase):
             formats.append('xztar')
 
         root_dir, base_dir = self._create_files()
+        expected = rlistdir(root_dir)
+        expected.remove('outer')
         for format in formats:
-            expected = rlistdir(root_dir)
-            expected.remove('outer')
-            if format == 'zip':
-                expected.remove('dist/sub2/')
             base_name = os.path.join(self.mkdtemp(), 'archive')
             filename = make_archive(base_name, format, root_dir, base_dir)