diff --git a/cli/manifest_element.php b/cli/manifest_element.php
index a2af665a..db0fdd86 100644
--- a/cli/manifest_element.php
+++ b/cli/manifest_element.php
@@ -112,10 +112,13 @@ switch (true) {
             $extFolder = $gm[1];
         }
 
-        // Element name: <element>, plugin= attribute, <packagename>, or filename
+        // Element name: <element>, module= attribute, plugin= attribute, <packagename>, or filename
         if (preg_match('/<element>([^<]+)<\/element>/', $xml, $em)) {
             $extElement = $em[1];
         }
+        if (empty($extElement) && preg_match('/module="([^"]*)"/', $xml, $mm)) {
+            $extElement = $mm[1];
+        }
         if (empty($extElement) && preg_match('/plugin="([^"]*)"/', $xml, $pm)) {
             $extElement = $pm[1];
         }
diff --git a/cli/release_package.php b/cli/release_package.php
index 134c5728..4d5851c3 100644
--- a/cli/release_package.php
+++ b/cli/release_package.php
@@ -213,10 +213,13 @@ if ($extManifest !== null) {
         $extFolder = $gm[1];
     }
 
-    // Element name: <element>, plugin= attribute, <packagename>, or filename
+    // Element name: <element>, module= attribute, plugin= attribute, <packagename>, or filename
     if (preg_match('/<element>([^<]+)<\/element>/', $xml, $em)) {
         $extElement = $em[1];
     }
+    if ($extElement === '' && preg_match('/module="([^"]*)"/', $xml, $mm)) {
+        $extElement = $mm[1];
+    }
     if ($extElement === '' && preg_match('/plugin="([^"]*)"/', $xml, $pm)) {
         $extElement = $pm[1];
     }