diff --git a/atom.gyp b/atom.gyp
index 9430bb740f21..74b8567f1725 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -334,6 +334,15 @@
                 '<@(fix_framework_link_command)',
               ],
             },
+            {
+              'postbuild_name': 'Add symlinks for framework subdirectories',
+              'action': [
+                'tools/mac/create-framework-subdir-symlinks.sh',
+                '<(product_name)',
+                'Libraries',
+                'Frameworks',
+              ],
+            },
           ],
         },  # target framework
         {
diff --git a/tools/mac/create-framework-subdir-symlinks.sh b/tools/mac/create-framework-subdir-symlinks.sh
new file mode 100755
index 000000000000..bfea1b3aac37
--- /dev/null
+++ b/tools/mac/create-framework-subdir-symlinks.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+cd "${BUILT_PRODUCTS_DIR}/${1}.framework"
+shift
+
+while [ ! -z "${1}" ]; do
+  ln -sf Versions/Current/"${1}" "${1}"
+  shift
+done