diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index 18e7a859..4c4197c2 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -93,7 +93,7 @@
         <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}"/>
-        <maven:pluginVar var="mainclass" plugin="maven-java-plugin" property="maven.jar.mainclass" />
+        <j:set var="mainclass" value="${maven.jar.mainclass}" />
         <j:if test="${!empty(mainclass)}">
             <ant:attribute name="Main-Class" value="${mainclass}"/>
         </j:if>
diff --git a/jar/plugin.properties b/jar/plugin.properties
index 7acd6b70..835f903e 100644
--- a/jar/plugin.properties
+++ b/jar/plugin.properties
@@ -17,9 +17,11 @@
 # -------------------------------------------------------------------
 # P L U G I N P R O P E R T I E S
 # -------------------------------------------------------------------
+maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
+maven.jar.mainclass = 
 maven.jar.manifest.extensions.add=false
 #maven.jar.includes=
 maven.jar.excludes = **/package.html
 maven.jar.index=false
 maven.jar.compress=true
-maven.remote.group=maven
\ No newline at end of file
+maven.remote.group=maven
diff --git a/java/plugin.properties b/java/plugin.properties
index cee571e4..8d970059 100644
--- a/java/plugin.properties
+++ b/java/plugin.properties
@@ -18,8 +18,5 @@
 # P L U G I N P R O P E R T I E S
 # -------------------------------------------------------------------
 
-# FIXME: Need to move these to the jar plugin
-maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
-maven.jar.mainclass = 
 maven.compile.target = 1.1
 maven.compile.source = 1.3