diff --git a/java/plugin.jelly b/java/plugin.jelly
index c24e2593..8ed838e6 100644
--- a/java/plugin.jelly
+++ b/java/plugin.jelly
@@ -173,7 +173,7 @@
         <attribute name="Created-By" value="Apache Jakarta Maven"/>
         <attribute name="Package" value="${pom.package}"/>
         <attribute name="Build-Jdk" value="${java.version}"/>
-        <!-- added supplimentary entries -->
+        <!-- added supplementary entries -->
         <attribute name="Extension-Name" value="${pom.artifactId}"/>
         <attribute name="Specification-Version" value="${pom.specificationVersion}"/>
         <attribute name="Specification-Vendor" value="${pom.organization.name}"/>
@@ -181,6 +181,10 @@
         <attribute name="Implementation-Version" value="${pom.currentVersion}"/>
         <attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
         <attribute name="Implementation-Vendor-Id" value="${pom.organization.identifier}"/>
+        <j:set var="mainclass" value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.jar.mainclass')}"/>
+ 		<j:if test="${!empty(mainclass)}">
+            <attribute name="Main-Class" value="${mainclass}"/>
+        </j:if>        
       </manifest>
     </jar>
   </goal>
diff --git a/java/plugin.properties b/java/plugin.properties
index 27c31188..4670466d 100644
--- a/java/plugin.properties
+++ b/java/plugin.properties
@@ -2,4 +2,5 @@
 # P L U G I N P R O P E R T I E S
 # -------------------------------------------------------------------
 
-maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
\ No newline at end of file
+maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
+maven.jar.mainclass = 
\ No newline at end of file
diff --git a/java/xdocs/properties.xml b/java/xdocs/properties.xml
index d04223fb..45f9a35d 100644
--- a/java/xdocs/properties.xml
+++ b/java/xdocs/properties.xml
@@ -219,6 +219,14 @@
             property will override Maven's defaults.
           </td>
         </tr>
+        <tr>
+          <td>maven.jar.mainclass</td>
+          <td>Yes</td>
+          <td>
+            Specifies the Main-Class attribute for your manifest. If not set,
+            no MainClass attribute will be added to the manifest.
+          </td>
+        </tr>
         <tr>
           <td>maven.jarResources.basedir</td>
           <td>Yes</td>