diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a171f4b8d..e3d01844b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -290,6 +290,7 @@ Tom Dimock
 Tom Eugelink
 Ulrich Schmidt
 Victor Toni
+Vincent Legoll
 Waldek Herka
 Will Wang
 William Ferguson
diff --git a/contributors.xml b/contributors.xml
index 755af007e..8f24c7c62 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -1171,6 +1171,10 @@
     <first>Victor</first>
     <last>Toni</last>
   </name>
+  <name>
+    <first>Vincent</first>
+    <last>Legoll</last>
+  </name>
   <name>
     <first>Will</first>
     <last>Wang</last>
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index bd98f9c19..5d053b670 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -717,6 +717,25 @@ shell-prompt> m4 foo.m4 > foo
 <delete includeemptydirs="true">
   <fileset dir="dirtokeep" includes="**/*" />
 </delete>
+]]></source>
+      </answer>
+    </faq>
+
+    <faq id="delete-directory-only-if-empty">
+      <question>How can I delete a particular directory,
+        if and only if it is empty?</question>
+      <answer>
+        <p>Most users who go down this path have no problem figuring
+          out that
+          <code>&lt;delete includeemptydirs="true" /&gt;</code> will
+          help them.  The seemingly tricky part is preserving the
+          non-empty directories, which Ant includes in the directory
+          scan. Fortunately the answer is simple:</p>
+
+        <source><![CDATA[
+<delete includeemptydirs="true">
+  <fileset dir="dirtokeepifnotempty" excludes="**/*" />
+</delete>
 ]]></source>
       </answer>
     </faq>