diff --git a/macros.nodejs b/macros.nodejs
index 4f14187..94eae4b 100644
--- a/macros.nodejs
+++ b/macros.nodejs
@@ -1,8 +1,12 @@
 # nodejs binary
 %__nodejs %{_bindir}/node
 
+# currently installed nodejs version
+%nodejs_version %(%{__nodejs} -v | sed s/v//)
+%_nodejs_major_version %(echo %{nodejs_version} | sed 's#^\\([0-9]\\+\\).*#\\1#')
+
 # nodejs library directory
-%nodejs_sitelib %{_prefix}/lib/node_modules
+%nodejs_sitelib %{_prefix}/lib/node_modules_%{_nodejs_major_version}
 
 #arch specific library directory
 #for future-proofing only; we don't do multilib
diff --git a/nodejs-packaging-bundler b/nodejs-packaging-bundler
index 47486a4..943368a 100755
--- a/nodejs-packaging-bundler
+++ b/nodejs-packaging-bundler
@@ -60,7 +60,7 @@ if [ -f "$TARBALL" ]; then
   mv ${TARBALL_DIR}/*.tgz .
   rm -rf ${TARBALL_DIR}
 else
-  npm pack ${PACKAGE}@${VERSION}
+  npm pack ${PACKAGE}
 fi
 tar xfz *.tgz
 cd package
@@ -70,10 +70,10 @@ for packagejson in $(find . -type d -name node_modules\* -prune -o -type f -name
   npm install --omit=dev --omit=optional
   if [ $? -ge 1 ] ; then
     echo "    ERROR WILL ROBINSON"
-    rm -rf node_modules
+	rm -rf node_modules
   else
     echo "    Successful prod dependencies download"
-    mv node_modules/ node_modules_prod
+	mv node_modules/ node_modules_prod
   fi
   popd
 done
@@ -102,15 +102,15 @@ for packagejson in $(find . -type d -name node_modules\* -prune -o -type f -name
     echo "    ERROR WILL ROBINSON"
   else
     echo "    Successful dev dependencies download"
-    mv node_modules/ node_modules_dev
+	mv node_modules/ node_modules_dev
   fi
   popd
 done
 if [ -d node_modules_prod ] ; then
-  tar cfz ../${PACKAGE_SAFE}-${VERSION}-nm-prod.tgz --sort=name $(find . -type d -name node_modules_prod)
+  tar cfz ../${PACKAGE_SAFE}-${VERSION}-nm-prod.tgz $(find . -type d -name node_modules_prod)
 fi
 if [ -d node_modules_dev ] ; then
-  tar cfz ../${PACKAGE_SAFE}-${VERSION}-nm-dev.tgz --sort=name $(find . -type d -name node_modules_dev)
+  tar cfz ../${PACKAGE_SAFE}-${VERSION}-nm-dev.tgz $(find . -type d -name node_modules_dev)
 fi
 cd ..
 cp -v ${PACKAGE_SAFE}-${VERSION}* "${OUTPUT_DIR}"
diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec
index 2a280db..2553f5b 100644
--- a/nodejs-packaging.spec
+++ b/nodejs-packaging.spec
@@ -19,6 +19,8 @@ Source0007: nodejs-symlink-deps
 Source0008: nodejs.attr
 Source0009: nodejs.prov
 Source0010: nodejs.req
+Source0011: nodejs_abi.attr
+Source0012: nodejs_abi.req
 
 Source0111: nodejs-packaging-bundler
 
@@ -27,6 +29,9 @@ Source0101: test.tar.gz
 
 BuildRequires:  python3
 
+# Several of the macros require the /usr/bin/node command, so we need to
+# ensure that it is present when packaging.
+Requires:       /usr/bin/node
 Requires:       redhat-rpm-config
 
 %description
@@ -58,8 +63,10 @@ tar xvf test.tar.gz
 %install
 install -Dpm0644 macros.nodejs %{buildroot}%{macrosdir}/macros.nodejs
 install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr
+install -Dpm0644 nodejs_abi.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs_abi.attr
 install -pm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov
 install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req
+install -pm0755 nodejs_abi.req %{buildroot}%{_rpmconfigdir}/nodejs_abi.req
 install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps
 install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep
 install -pm0755 nodejs-setversion %{buildroot}%{_rpmconfigdir}/nodejs-setversion
diff --git a/nodejs-symlink-deps b/nodejs-symlink-deps
index ba525eb..b5e44b3 100755
--- a/nodejs-symlink-deps
+++ b/nodejs-symlink-deps
@@ -30,8 +30,6 @@ import shutil
 import sys
 
 def symlink(source, dest):
-    if os.path.sep in dest:
-        os.makedirs(os.path.dirname(dest), exist_ok=True)
     try:
         os.symlink(source, dest)
     except OSError:
diff --git a/nodejs.req b/nodejs.req
index 47e94aa..129606b 100755
--- a/nodejs.req
+++ b/nodejs.req
@@ -633,9 +633,9 @@ def has_only_bundled_dependencies(module_dir_path):
             for basename in os.listdir(dependency_root_path)
         )
         bundled_dependency_iter = (
-            path
+            os.path.realpath(path)
             for path in dependency_path_iter
-            if not os.path.islink(path) or os.path.realpath(path).startswith(module_root_path)
+            if not os.path.islink(path) or path.startswith(module_root_path)
         )
 
         return any(bundled_dependency_iter)
@@ -659,6 +659,9 @@ def extract_dependencies(metadata_path, optional=False):
         TypeError: Invalid dependency data type.
     """
 
+    if has_only_bundled_dependencies(os.path.dirname(metadata_path)):
+        return  # skip
+
     # Read metadata
     try:
         with open(metadata_path, mode="r") as metadata_file:
@@ -673,9 +676,6 @@ def extract_dependencies(metadata_path, optional=False):
         except KeyError:  # NodeJS engine version unspecified
             yield rpm_format("nodejs(engine)")
 
-    if has_only_bundled_dependencies(os.path.dirname(metadata_path)):
-        return  # skip
-
     # Report listed dependencies
     kind = "optionalDependencies" if optional else "dependencies"
     container = metadata.get(kind, {})
diff --git a/nodejs_abi.attr b/nodejs_abi.attr
new file mode 100644
index 0000000..d161239
--- /dev/null
+++ b/nodejs_abi.attr
@@ -0,0 +1,2 @@
+%__nodejs_native_requires %{_rpmconfigdir}/nodejs_abi.req
+%__nodejs_native_path ^/usr/lib.*/node_modules/.*\\.node$
diff --git a/nodejs_abi.req b/nodejs_abi.req
new file mode 100755
index 0000000..a33a7b5
--- /dev/null
+++ b/nodejs_abi.req
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Get the ABI version
+abi_version=$(/usr/bin/node -p process.versions.modules)
+
+# Write out the Virtual Requires
+echo "nodejs(abi) = ${abi_version}"
+
diff --git a/sources b/sources
index a7170f1..52e9e27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (test.tar.gz) = 04c1e741caa124c12b1070b6411d1a9fef9b328e15ec274170b7dcd9d26d9a6f9db21d6722ce0b39d0b693f237398065dd127b95a9a6e4947e182db2e3fad6f2
+SHA512 (test.tar.gz) = dfbda67b8741f1ca36bf63b2e842f81ba07381b3d92e75fa7e29f8e456543b4cae55e95785902f31a14ae4d0b7e89161ba04c0c10c2fff617b4ae9607c91e599
diff --git a/test/bundled/nodejs.req.out.exp b/test/bundled/nodejs.req.out.exp
index 64d8bb4..8b13789 100644
--- a/test/bundled/nodejs.req.out.exp
+++ b/test/bundled/nodejs.req.out.exp
@@ -1 +1 @@
-(nodejs(engine) >= 6 with nodejs(engine) < 10)
+
diff --git a/test/bundled_namespace/nodejs.req.out.exp b/test/bundled_namespace/nodejs.req.out.exp
index 64d8bb4..8b13789 100644
--- a/test/bundled_namespace/nodejs.req.out.exp
+++ b/test/bundled_namespace/nodejs.req.out.exp
@@ -1 +1 @@
-(nodejs(engine) >= 6 with nodejs(engine) < 10)
+