diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index d50bb8bf6..6833adf12 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -156,6 +156,17 @@
     </fail>
   </target>
 
+  <!-- Bugzilla Report 33412 -->
+  <target name="testDefaultExcludesAndUpdate">
+    <mkdir dir="ziptest"/>
+    <touch file="ziptest/ziptest~"/>
+    <zip destfile="test3.zip" basedir="ziptest" defaultexcludes="false"/>
+    <touch file="ziptest/ziptest2"/>
+    <zip destfile="test3.zip" basedir="ziptest"
+      defaultexcludes="false"
+      update="true"/>
+  </target>
+
   <target name="cleanup">
     <delete file="test3.zip"/>
     <delete file="test4.zip"/>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
index a2dc72d10..9db2078dc 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -21,6 +21,7 @@ import org.apache.tools.ant.BuildFileTest;
 import java.io.File;
 import java.io.IOException;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import java.util.Enumeration;
 
@@ -49,9 +50,9 @@ public class ZipTest extends BuildFileTest {
         expectBuildException("test3", "zip cannot include itself");
     }
 
-//    public void test4() {
-//        expectBuildException("test4", "zip cannot include itself");
-//    }
+    //    public void test4() {
+    //        expectBuildException("test4", "zip cannot include itself");
+    //    }
 
     public void tearDown() {
         try {
@@ -148,4 +149,20 @@ public class ZipTest extends BuildFileTest {
     public void testCompressionLevel() {
         executeTarget("testCompressionLevel");
     }
+
+    // Bugzilla Report 33412
+    public void testDefaultExcludesAndUpdate() 
+        throws ZipException, IOException {
+        executeTarget("testDefaultExcludesAndUpdate");
+        ZipFile f = null;
+        try {
+            f = new ZipFile(getProject().resolveFile("test3.zip"));
+            assertNotNull("ziptest~ should be included",
+                          f.getEntry("ziptest~"));
+        } finally {
+            if (f != null) {
+                f.close();
+            }
+        }
+    }
 }