diff --git a/extract_utils.sh b/extract_utils.sh
index 33ddea9..ab64e23 100644
--- a/extract_utils.sh
+++ b/extract_utils.sh
@@ -375,6 +375,11 @@
         EXTENSION=${BASENAME##*.}
         PKGNAME=${BASENAME%.*}
 
+        if [ "$CLASS" = "EXECUTABLES" ] && [ "$EXTENSION" != "sh" ]; then
+            PKGNAME="$BASENAME"
+            EXTENSION=""
+        fi
+
         # Allow overriding module name
         STEM=
         for ARG in "${ARGS[@]}"; do