diff --git a/docs/index.html b/docs/index.html
index 28341f04c..0052975b6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4649,6 +4649,11 @@ supports all attributes of <code>&lt;fileset&gt;</code>
     <td valign="top">additional arguments for IDL file generation</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">debug</td>
+    <td valign="top">generate debug info (passes -g to rmic). Defaults to false.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 75b6cf47d..a020fd1d1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -108,6 +108,7 @@ public class Rmic extends MatchingTask {
     private String  iiopopts;
     private boolean idl  = false;
     private String  idlopts;
+    private boolean debug  = false;
 
     private Vector compileList = new Vector();
 
@@ -133,6 +134,10 @@ public class Rmic extends MatchingTask {
         filtering = filter;
     }
 
+    public void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+
     /**
      * Set the classpath to be used for this compilation.
      */
@@ -273,6 +278,9 @@ public class Rmic extends MatchingTask {
             if( idlopts != null ) 
                 cmd.createArgument().setValue(idlopts);
         }
+        if( debug )  {
+            cmd.createArgument().setValue("-g");
+        }
 
         int fileCount = compileList.size();
         if (fileCount > 0) {