diff --git a/tools/combine b/tools/combine
index 9b804d5..c6aa7b2 100755
--- a/tools/combine
+++ b/tools/combine
@@ -33,8 +33,13 @@ RMTRAIL="$PATH_TOOLS/rmtrail"
 cat_modules=$(
     cd "$PATH_TOOLS/../" &&
     grep -rIo ' require(.*)' lib/ \
-        | sed "s/^lib\///;s/\.js://;s/require( *'\.\/\(.*\)'.*/\1/" \
-        | node tools/combine-order.js
+        | sed " \
+            s/^lib\/\(\(.\+\/\)\?[^/]\+\)\.js: /\1 \2/;
+            s/require( *'\(.*\)'.*/\1/;
+            s/[^/\]\+\/\.\.//g;
+            s/\( \|\/\)\.\//\1/g;
+        " \
+        | node tools/combine-order.js \
 ) || {
     echo "Failed to get module list" >&2
     exit 3