diff --git a/BLFS/xsl/bump.xsl b/BLFS/xsl/bump.xsl
index a918bfa..1f368a7 100644
--- a/BLFS/xsl/bump.xsl
+++ b/BLFS/xsl/bump.xsl
@@ -13,7 +13,8 @@
     <xsl:choose>
       <xsl:when test="$version='N'">
         <xsl:value-of select=
-            "document($packages)//package[string(name)=$package]/version"/>
+            "document($packages)//*[self::package or self::module]
+                                   [string(name)=$package]/version"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="$version"/>
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index 993e1e8..22680e8 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -63,7 +63,8 @@ config  SUDO
 
   <xsl:template match="list">
     <xsl:if
-      test=".//package[(version and not(inst-version)) or
+      test=".//*[self::package or self::module]
+                    [(version and not(inst-version)) or
                       string(version) != string(inst-version)]">
       <xsl:text>config&#9;MENU_</xsl:text>
       <xsl:value-of select="@id"/>
@@ -90,7 +91,8 @@ depends MENU_</xsl:text>
 
   <xsl:template match="sublist">
     <xsl:if
-      test=".//package[(version and not(inst-version)) or
+      test=".//*[self::package or self::module]
+                    [(version and not(inst-version)) or
                       string(version) != string(inst-version)]">
       <xsl:text>&#9;config&#9;MENU_</xsl:text>
       <xsl:value-of select="@id"/>