diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..0411ef8067
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+build/
+*.iml
diff --git a/build.xml b/build.xml
index 093d163def..9624f64a68 100644
--- a/build.xml
+++ b/build.xml
@@ -286,7 +286,7 @@ Authors:
       </fileset>
     </copy>
 
-    <xjavac srcdir="${build.src}"
+    <javac srcdir="${build.src}"
            destdir="${build.dest}"
            source="${javac.source}"
            target="${javac.target}"
diff --git a/src/org/apache/html/dom/HTMLElementImpl.java b/src/org/apache/html/dom/HTMLElementImpl.java
index e4f6a80e0d..0931ae01ca 100644
--- a/src/org/apache/html/dom/HTMLElementImpl.java
+++ b/src/org/apache/html/dom/HTMLElementImpl.java
@@ -20,6 +20,7 @@
 
 import org.apache.xerces.dom.ElementImpl;
 import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.html.HTMLElement;
@@ -58,7 +59,11 @@ public class HTMLElementImpl
     public HTMLElementImpl( HTMLDocumentImpl owner, String tagName ) {
         super( owner, tagName.toUpperCase(Locale.ENGLISH) );
     }
-    
+
+    public Document getContentDocument() {
+        return ownerDocument.getOwnerDocument();
+    }
+
     public String getId() {
         return getAttribute( "id" );
     }
diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
index ab01942a10..956280cd37 100644
--- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java
+++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
@@ -16,6 +16,7 @@
  */
 package org.apache.html.dom;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.html.HTMLIFrameElement;
 
 /**
diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java
index cc31952289..f062a63df6 100644
--- a/src/org/apache/html/dom/HTMLObjectElementImpl.java
+++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java
@@ -16,6 +16,7 @@
  */
 package org.apache.html.dom;
 
+import org.w3c.dom.Document;
 import org.w3c.dom.html.HTMLObjectElement;
 
 /**