diff --git a/src/Composer/Package/Archiver/ArchivableFilesFinder.php b/src/Composer/Package/Archiver/ArchivableFilesFinder.php
index 1e94f1e15..92e281a2a 100644
--- a/src/Composer/Package/Archiver/ArchivableFilesFinder.php
+++ b/src/Composer/Package/Archiver/ArchivableFilesFinder.php
@@ -13,7 +13,9 @@
 namespace Composer\Package\Archiver;
 
 use Composer\Util\Filesystem;
+use FilesystemIterator;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 /**
  * A Symfony Finder wrapper which locates files that should go into archives
@@ -84,6 +86,14 @@ class ArchivableFilesFinder extends \FilterIterator
 
     public function accept()
     {
-        return !$this->getInnerIterator()->current()->isDir();
+        /** @var SplFileInfo $current */
+        $current = $this->getInnerIterator()->current();
+
+        if (!$current->isDir()) {
+            return true;
+        }
+
+        $iterator = new FilesystemIterator($current, FilesystemIterator::SKIP_DOTS);
+        return !$iterator->valid();
     }
 }
diff --git a/src/Composer/Package/Archiver/ZipArchiver.php b/src/Composer/Package/Archiver/ZipArchiver.php
index bc5719dce..310addaea 100644
--- a/src/Composer/Package/Archiver/ZipArchiver.php
+++ b/src/Composer/Package/Archiver/ZipArchiver.php
@@ -37,7 +37,11 @@ class ZipArchiver implements ArchiverInterface
                 /** @var $file \SplFileInfo */
                 $filepath = $file->getPath()."/".$file->getFilename();
                 $localname = str_replace($sources."/", '', $filepath);
-                $zip->addFile($filepath, $localname);
+                if ($file->isDir()) {
+                    $zip->addEmptyDir($localname);
+                } else {
+                    $zip->addFile($filepath, $localname);
+                }
             }
             if ($zip->close()) {
                 return $target;