diff -r 61fcb12a9873 Lib/shutil.py
--- a/Lib/shutil.py	Thu Oct 20 12:18:10 2016 +0200
+++ b/Lib/shutil.py	Thu Oct 20 18:50:50 2016 +0300
@@ -680,9 +680,10 @@ def _make_zipfile(base_name, base_dir, v
         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)
+            if path != os.curdir:
+                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 sorted(dirnames):
                     path = os.path.normpath(os.path.join(dirpath, name))
diff -r 61fcb12a9873 Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py	Thu Oct 20 12:18:10 2016 +0200
+++ b/Lib/test/test_shutil.py	Thu Oct 20 18:50:50 2016 +0300
@@ -1066,6 +1066,19 @@ class TestShutil(unittest.TestCase):
 
         with support.change_cwd(work_dir):
             base_name = os.path.abspath(rel_base_name)
+            res = make_archive(rel_base_name, 'zip', root_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/', 'dist/sub/', 'dist/sub2/',
+                     'dist/file1', 'dist/file2', 'dist/sub/file3',
+                     'outer'])
+
+        with support.change_cwd(work_dir):
+            base_name = os.path.abspath(rel_base_name)
             res = make_archive(rel_base_name, 'zip', root_dir, base_dir)
 
         self.assertEqual(res, base_name + '.zip')