diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index cda4c26b2..666d771de 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -4,6 +4,7 @@
 
   <property name="tmp.jar" location="tmp.jar"/>
   <property name="tmp.dir" location="jartmp"/>
+  <property name="tmp.zip" location="tmp.zip"/>
 
   <target name="test1">
     <jar/>
@@ -94,9 +95,79 @@
     <unjar src="${tmp.jar}" dest="${tmp.dir}"/>
   </target>    
 
+  <target name="testNoRecreateBasedirExcludesWithUpdate">
+    <jar
+         destfile="${tmp.jar}"
+         basedir="."
+         includes="j*.xml"
+         excludes="java.xml"
+         update="true"
+    />
+  </target>
+
+  <target name="testNoRecreateBasedirExcludesWithoutUpdate">
+    <jar
+         destfile="${tmp.jar}"
+         basedir="."
+         includes="j*.xml"
+         excludes="java.xml"
+    />
+  </target>
+
+  <target name="makezip">
+    <zip destfile="${tmp.zip}"
+         basedir="." includes="j*.xml"/>
+  </target>
+
+  <target name="testNoRecreateZipfilesetExcludesWithUpdate"
+          depends="makezip">
+    <jar destfile="${tmp.jar}"
+         update="true">
+      <zipfileset src="${tmp.zip}" excludes="java.xml"/>
+    </jar>
+  </target>
+
+  <target name="testNoRecreateZipfilesetExcludesWithoutUpdate"
+          depends="makezip">
+    <jar destfile="${tmp.jar}">
+      <zipfileset src="${tmp.zip}" excludes="java.xml"/>
+    </jar>
+  </target>
+
+  <target name="testRecreateZipfilesetWithoutUpdateAdditionalFiles"
+          depends="makezip">
+    <jar destfile="${tmp.jar}">
+      <zipfileset src="${tmp.zip}"/>
+    </jar>
+  </target>
+
+  <target name="testRecreateZipfilesetWithUpdateAdditionalFiles"
+          depends="makezip">
+    <jar destfile="${tmp.jar}"
+         update="true">
+      <zipfileset src="${tmp.zip}"/>
+    </jar>
+  </target>
+
+  <target name="testRecreateZipfilesetWithoutUpdateNewerFile"
+          depends="makezip">
+    <jar destfile="${tmp.jar}">
+      <zipfileset src="${tmp.zip}" includes="jar.xml"/>
+    </jar>
+  </target>
+
+  <target name="testRecreateZipfilesetWithUpdateNewerFile"
+          depends="makezip">
+    <jar destfile="${tmp.jar}"
+         update="true">
+      <zipfileset src="${tmp.zip}" includes="jar.xml"/>
+    </jar>
+  </target>
+
   <target name="cleanup">
     <delete file="${tmp.jar}" />
     <delete dir="${tmp.dir}"/>
+    <delete file="${tmp.zip}" />
   </target>
 
 </project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index cf8643ae9..76f532f02 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -163,4 +163,41 @@ public class JarTest extends BuildFileTest {
                                         .resolveFile("jartmp/META-INF/MANIFEST.MF")));
         assertEquals(mf1, mf2);
     }
+
+    public void testNoRecreateBasedirExcludesWithUpdate() {
+        testNoRecreate("testNoRecreateBasedirExcludesWithUpdate");
+    }
+
+    public void testNoRecreateBasedirExcludesWithoutUpdate() {
+        testNoRecreate("testNoRecreateBasedirExcludesWithoutUpdate");
+    }
+
+    public void testNoRecreateZipfilesetExcludesWithUpdate() {
+        testNoRecreate("testNoRecreateZipfilesetExcludesWithUpdate");
+    }
+
+    public void testNoRecreateZipfilesetExcludesWithoutUpdate() {
+        testNoRecreate("testNoRecreateZipfilesetExcludesWithoutUpdate");
+    }
+
+    public void testRecreateZipfilesetWithoutUpdateAdditionalFiles() {
+        testRecreate("test4",
+                     "testRecreateZipfilesetWithoutUpdateAdditionalFiles");
+    }
+
+    public void testRecreateZipfilesetWithUpdateAdditionalFiles() {
+        testRecreate("test4",
+                     "testRecreateZipfilesetWithUpdateAdditionalFiles");
+    }
+
+    public void testRecreateZipfilesetWithoutUpdateNewerFile() {
+        testRecreate("testRecreateNewerFileSetup",
+                     "testRecreateZipfilesetWithoutUpdateNewerFile");
+    }
+
+    public void testRecreateZipfilesetWithUpdateNewerFile() {
+        testRecreate("testRecreateNewerFileSetup",
+                     "testRecreateZipfilesetWithUpdateNewerFile");
+    }
+
 }