diff --git a/WHATSNEW b/WHATSNEW
index 5e6e2bd96..90fe9f93a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -80,6 +80,8 @@ Fixed bugs:
 
 * FTP task, getTimeDiff method was returning wrong value. Bugzilla 30595.
 
+* Zip task was not zipping when only empty directories were found. Bugzilla 30365.
+
 Changes from Ant 1.6.1 to Ant 1.6.2
 ===================================
 
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index f6dd7046f..3363e6407 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -128,6 +128,12 @@
     <zip destfile="test3.zip" basedir="ziptest" whenempty="skip"/>
   </target>
 
+  <!-- Bugzilla Report 30365 -->
+  <target name="zipEmptyDir">
+        <mkdir dir="empty/empty2"/>
+		<zip destfile="test3.zip" basedir="empty" update="true"/>
+  </target>
+
   <target name="cleanup">
     <delete file="test3.zip"/>
     <delete file="test4.zip"/>
@@ -140,5 +146,6 @@
     <delete file="zipgroupfileset.zip"/>
     <delete file="../dummyfile" />
     <delete dir="ziptest"/>
+    <delete dir="empty"/>
   </target>
 </project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
index cc4bd79fb..9934e7d33 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -133,4 +133,10 @@ public class ZipTest extends BuildFileTest {
         assertTrue("archive should get skipped",
                    !getProject().resolveFile("test3.zip").exists());
     }
+    // Bugzilla Report 30365
+    public void testZipEmptyDir() {
+        executeTarget("zipEmptyDir");
+        assertTrue("archive should be created",
+                   getProject().resolveFile("test3.zip").exists());
+    }
 }