diff --git a/war/plugin.jelly b/war/plugin.jelly
index 68207df6..81a70c55 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -121,12 +121,16 @@
           <j:set var="specificationVersion" value="${specificationVersion}.${versionItems[2]}" />
         </j:if>
 
-        <ant:attribute name="Specification-Title" value="${specificationTitle}"/>
-        <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
-        <ant:attribute name="Specification-Version" value="${specificationVersion}"/>
-        <ant:attribute name="Implementation-Title" value="${pom.package}"/>
-        <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
-        <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+        <util:replace var="packagePath" oldChar="." newChar="/" value="${pom.package}"/>
+        <ant:section name="${packagePath}">
+          <ant:attribute name="Extension-name" value="${pom.package}"/>
+          <ant:attribute name="Specification-Title" value="${specificationTitle}"/>
+          <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
+          <ant:attribute name="Specification-Version" value="${specificationVersion}"/>
+          <ant:attribute name="Implementation-Title" value="${pom.package}"/>
+          <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
+          <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+        </ant:section>
       </ant:manifest>
 
     </ant:jar>
diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 53bfe7e7..6ae9cb57 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -25,7 +25,7 @@
   </properties>
   <body>
     <release version="1.6.2-SNAPSHOT" date="in SVN">
-      <action dev="snicoll" type="fix" issue="MPWAR-47">Specification and Implementation attributes of the manifest are now defined as main attributes.</action>
+      <action dev="snicoll" type="fix" issue="MPWAR-58">Manifest file is now generated properly.</action>
       <action dev="snicoll" type="add" issue="MPWAR-43">Aded the ability to customize the Class-Path entry of the manifest</action>
       <action dev="snicoll" type="update" issue="MPWAR-49">Added property <code>maven.war.resources.overwrite</code> to control is resources overwrites the ones in the generated webapp directory.</action>
       <action dev="snicoll" type="update" issue="MPWAR-37" due-to="Troy Poppe">Added ability to expand properties when copying war resources.</action>
