diff --git a/platformio/package/pack.py b/platformio/package/pack.py
index 4cbaa6c0..0145a61e 100644
--- a/platformio/package/pack.py
+++ b/platformio/package/pack.py
@@ -28,11 +28,13 @@ from platformio.unpacker import FileUnpacker
 class PackagePacker(object):
     EXCLUDE_DEFAULT = [
         "._*",
+        "__*",
         ".DS_Store",
-        ".git",
-        ".hg",
-        ".svn",
-        ".pio",
+        ".git/",
+        ".hg/",
+        ".svn/",
+        ".pio/",
+        "**/.pio/",
     ]
     INCLUDE_DEFAULT = ManifestFileType.items().values()