diff --git a/pom.xml b/pom.xml
index 41f46725..0f6fc425 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <groupId>nu.validator.htmlparser</groupId>
   <artifactId>htmlparser</artifactId>
   <packaging>bundle</packaging>
-  <version>1.4</version>
+  <version>1.5</version>
   <name>htmlparser</name>
   <url>http://about.validator.nu/htmlparser/</url>
   <description>The Validator.nu HTML Parser is an implementation of the HTML5 parsing algorithm in Java for applications. The parser is designed to work as a drop-in replacement for the XML parser in applications that already support XHTML 1.x content with an XML parser and use SAX, DOM or XOM to interface with the parser.</description>
@@ -69,8 +69,8 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:hg:http://hg.mozilla.org/projects/htmlparser/</connection>
-    <url>http://hg.mozilla.org/projects/htmlparser/</url>
+    <connection>scm:git:https://github.com/validator/htmlparser.git</connection>
+    <url>https://github.com/validator/htmlparser</url>
   </scm>
   <build>
     <sourceDirectory>${project.build.directory}/src</sourceDirectory>
@@ -80,22 +80,13 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.7</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>1.5.0</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>intitialize-sources</id>
@@ -121,6 +112,7 @@
             </goals>
             <configuration>
               <target>
+                <property name="build.compiler" value="extJavac"/>
                 <property name="translator.sources" value="${basedir}/translator-src"/>
                 <property name="translator.classes" value="${project.build.directory}/translator-classes"/>
                 <mkdir dir="${translator.classes}"/>
@@ -157,7 +149,8 @@
             <Bundle-Name>${project.name}</Bundle-Name>
             <Bundle-SymbolicName>nu.validator.htmlparser</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
-            <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Automatic-Module-Name>nu.validator.htmlparser</Automatic-Module-Name>
             <_removeheaders>Built-By,Bnd-LastModified</_removeheaders>
           </instructions>
         </configuration>
@@ -214,7 +207,7 @@
     <dependency>
       <groupId>xom</groupId>
       <artifactId>xom</artifactId>
-      <version>1.1</version>
+      <version>[1.3.5,)</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/src/nu/validator/htmlparser/common/DoctypeExpectation.java b/src/nu/validator/htmlparser/common/DoctypeExpectation.java
index a34af51f..31f69ba7 100644
--- a/src/nu/validator/htmlparser/common/DoctypeExpectation.java
+++ b/src/nu/validator/htmlparser/common/DoctypeExpectation.java
@@ -28,6 +28,7 @@
  * @version $Id$
  * @author hsivonen
  */
+@Deprecated
 public enum DoctypeExpectation {
     /**
      * Be a pure HTML5 parser.
diff --git a/src/nu/validator/htmlparser/common/DocumentModeHandler.java b/src/nu/validator/htmlparser/common/DocumentModeHandler.java
index 55377e0e..6c301965 100644
--- a/src/nu/validator/htmlparser/common/DocumentModeHandler.java
+++ b/src/nu/validator/htmlparser/common/DocumentModeHandler.java
@@ -39,8 +39,10 @@ public interface DocumentModeHandler {
      * @param mode the document mode
      * @param publicIdentifier the public id of the doctype or <code>null</code> if unavailable
      * @param systemIdentifier the system id of the doctype or <code>null</code> if unavailable
-     * @param html4SpecificAdditionalErrorChecks <code>true</code> if HTML 4-specific checks were enabled, <code>false</code> otherwise
      * @throws SAXException if things go wrong
      */
+    public void documentMode(DocumentMode mode, String publicIdentifier, String systemIdentifier) throws SAXException;
+
+    @Deprecated
     public void documentMode(DocumentMode mode, String publicIdentifier, String systemIdentifier, boolean html4SpecificAdditionalErrorChecks) throws SAXException;
 }
diff --git a/src/nu/validator/htmlparser/dom/DOMTreeBuilder.java b/src/nu/validator/htmlparser/dom/DOMTreeBuilder.java
index 2b8eff23..6ccf75a4 100644
--- a/src/nu/validator/htmlparser/dom/DOMTreeBuilder.java
+++ b/src/nu/validator/htmlparser/dom/DOMTreeBuilder.java
@@ -248,8 +248,15 @@ protected DOMTreeBuilder(DOMImplementation implementation) {
     /**
      * 
      * @see nu.validator.htmlparser.impl.TreeBuilder#documentMode(nu.validator.htmlparser.common.DocumentMode,
-     *      java.lang.String, java.lang.String, boolean)
+     *      java.lang.String, java.lang.String)
      */
+    protected void documentMode(DocumentMode mode, String publicIdentifier,
+            String systemIdentifier)
+            throws SAXException {
+        document.setUserData("nu.validator.document-mode", mode, null);
+    }
+
+    @Deprecated
     protected void documentMode(DocumentMode mode, String publicIdentifier,
             String systemIdentifier, boolean html4SpecificAdditionalErrorChecks)
             throws SAXException {
diff --git a/src/nu/validator/htmlparser/dom/HtmlDocumentBuilder.java b/src/nu/validator/htmlparser/dom/HtmlDocumentBuilder.java
index f4a307c9..f2619c05 100644
--- a/src/nu/validator/htmlparser/dom/HtmlDocumentBuilder.java
+++ b/src/nu/validator/htmlparser/dom/HtmlDocumentBuilder.java
@@ -462,6 +462,7 @@ public void setScriptingEnabled(boolean scriptingEnabled) {
      * 
      * @return the doctypeExpectation
      */
+    @Deprecated
     public DoctypeExpectation getDoctypeExpectation() {
         return doctypeExpectation;
     }
@@ -473,6 +474,7 @@ public DoctypeExpectation getDoctypeExpectation() {
      *            the doctypeExpectation to set
      * @see nu.validator.htmlparser.impl.TreeBuilder#setDoctypeExpectation(nu.validator.htmlparser.common.DoctypeExpectation)
      */
+    @Deprecated
     public void setDoctypeExpectation(DoctypeExpectation doctypeExpectation) {
         this.doctypeExpectation = doctypeExpectation;
         if (treeBuilder != null) {
@@ -526,6 +528,7 @@ public void setStreamabilityViolationPolicy(
      * the name in the value.
      * @param html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public void setHtml4ModeCompatibleWithXhtml1Schemata(
             boolean html4ModeCompatibleWithXhtml1Schemata) {
         this.html4ModeCompatibleWithXhtml1Schemata = html4ModeCompatibleWithXhtml1Schemata;
@@ -548,6 +551,7 @@ public Locator getDocumentLocator() {
      * 
      * @return the html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public boolean isHtml4ModeCompatibleWithXhtml1Schemata() {
         return html4ModeCompatibleWithXhtml1Schemata;
     }
diff --git a/src/nu/validator/htmlparser/impl/Tokenizer.java b/src/nu/validator/htmlparser/impl/Tokenizer.java
index 45073f85..6bf71e86 100755
--- a/src/nu/validator/htmlparser/impl/Tokenizer.java
+++ b/src/nu/validator/htmlparser/impl/Tokenizer.java
@@ -748,6 +748,7 @@ public void setNamePolicy(XmlViolationPolicy namePolicy) {
      * @param html4ModeCompatibleWithXhtml1Schemata
      *            the html4ModeCompatibleWithXhtml1Schemata to set
      */
+    @Deprecated
     public void setHtml4ModeCompatibleWithXhtml1Schemata(
             boolean html4ModeCompatibleWithXhtml1Schemata) {
         this.html4ModeCompatibleWithXhtml1Schemata = html4ModeCompatibleWithXhtml1Schemata;
diff --git a/src/nu/validator/htmlparser/impl/TreeBuilder.java b/src/nu/validator/htmlparser/impl/TreeBuilder.java
index 02cc6409..13d9ecb3 100644
--- a/src/nu/validator/htmlparser/impl/TreeBuilder.java
+++ b/src/nu/validator/htmlparser/impl/TreeBuilder.java
@@ -6027,6 +6027,7 @@ public void setIsSrcdocDocument(boolean isSrcdocDocument) {
      * @param doctypeExpectation
      *            the doctypeExpectation to set
      */
+    @Deprecated
     public void setDoctypeExpectation(DoctypeExpectation doctypeExpectation) {
         this.doctypeExpectation = doctypeExpectation;
     }
diff --git a/src/nu/validator/htmlparser/io/Driver.java b/src/nu/validator/htmlparser/io/Driver.java
index d685e69d..e4d6931b 100644
--- a/src/nu/validator/htmlparser/io/Driver.java
+++ b/src/nu/validator/htmlparser/io/Driver.java
@@ -558,6 +558,7 @@ public void setTransitionHandler(TransitionHandler transitionHandler) {
      * @param html4ModeCompatibleWithXhtml1Schemata
      * @see nu.validator.htmlparser.impl.Tokenizer#setHtml4ModeCompatibleWithXhtml1Schemata(boolean)
      */
+    @Deprecated
     public void setHtml4ModeCompatibleWithXhtml1Schemata(
             boolean html4ModeCompatibleWithXhtml1Schemata) {
         tokenizer.setHtml4ModeCompatibleWithXhtml1Schemata(html4ModeCompatibleWithXhtml1Schemata);
diff --git a/src/nu/validator/htmlparser/sax/HtmlParser.java b/src/nu/validator/htmlparser/sax/HtmlParser.java
index 714053e7..8eddd601 100644
--- a/src/nu/validator/htmlparser/sax/HtmlParser.java
+++ b/src/nu/validator/htmlparser/sax/HtmlParser.java
@@ -817,6 +817,7 @@ public void setScriptingEnabled(boolean scriptingEnabled) {
      * 
      * @return the doctypeExpectation
      */
+    @Deprecated
     public DoctypeExpectation getDoctypeExpectation() {
         return doctypeExpectation;
     }
@@ -828,6 +829,7 @@ public DoctypeExpectation getDoctypeExpectation() {
      *            the doctypeExpectation to set
      * @see nu.validator.htmlparser.impl.TreeBuilder#setDoctypeExpectation(nu.validator.htmlparser.common.DoctypeExpectation)
      */
+    @Deprecated
     public void setDoctypeExpectation(DoctypeExpectation doctypeExpectation) {
         this.doctypeExpectation = doctypeExpectation;
         if (treeBuilder != null) {
@@ -881,6 +883,7 @@ public void setStreamabilityViolationPolicy(
      * the name in the value.
      * @param html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public void setHtml4ModeCompatibleWithXhtml1Schemata(
             boolean html4ModeCompatibleWithXhtml1Schemata) {
         this.html4ModeCompatibleWithXhtml1Schemata = html4ModeCompatibleWithXhtml1Schemata;
@@ -903,6 +906,7 @@ public Locator getDocumentLocator() {
      * 
      * @return the html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public boolean isHtml4ModeCompatibleWithXhtml1Schemata() {
         return html4ModeCompatibleWithXhtml1Schemata;
     }
diff --git a/src/nu/validator/htmlparser/xom/HtmlBuilder.java b/src/nu/validator/htmlparser/xom/HtmlBuilder.java
index 845ea15c..7c0d0834 100644
--- a/src/nu/validator/htmlparser/xom/HtmlBuilder.java
+++ b/src/nu/validator/htmlparser/xom/HtmlBuilder.java
@@ -499,6 +499,7 @@ public void setScriptingEnabled(boolean scriptingEnabled) {
      * 
      * @return the doctypeExpectation
      */
+    @Deprecated
     public DoctypeExpectation getDoctypeExpectation() {
         return doctypeExpectation;
     }
@@ -510,6 +511,7 @@ public DoctypeExpectation getDoctypeExpectation() {
      *            the doctypeExpectation to set
      * @see nu.validator.htmlparser.impl.TreeBuilder#setDoctypeExpectation(nu.validator.htmlparser.common.DoctypeExpectation)
      */
+    @Deprecated
     public void setDoctypeExpectation(DoctypeExpectation doctypeExpectation) {
         this.doctypeExpectation = doctypeExpectation;
         if (treeBuilder != null) {
@@ -563,6 +565,7 @@ public void setStreamabilityViolationPolicy(
      * the name in the value.
      * @param html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public void setHtml4ModeCompatibleWithXhtml1Schemata(
             boolean html4ModeCompatibleWithXhtml1Schemata) {
         this.html4ModeCompatibleWithXhtml1Schemata = html4ModeCompatibleWithXhtml1Schemata;
@@ -585,6 +588,7 @@ public Locator getDocumentLocator() {
      * 
      * @return the html4ModeCompatibleWithXhtml1Schemata
      */
+    @Deprecated
     public boolean isHtml4ModeCompatibleWithXhtml1Schemata() {
         return html4ModeCompatibleWithXhtml1Schemata;
     }
diff --git a/src/nu/validator/htmlparser/xom/XOMTreeBuilder.java b/src/nu/validator/htmlparser/xom/XOMTreeBuilder.java
index 623f3192..e10cb863 100644
--- a/src/nu/validator/htmlparser/xom/XOMTreeBuilder.java
+++ b/src/nu/validator/htmlparser/xom/XOMTreeBuilder.java
@@ -254,9 +254,19 @@ protected void start(boolean fragment) throws SAXException {
 
     /**
      * @see nu.validator.htmlparser.impl.TreeBuilder#documentMode(nu.validator.htmlparser.common.DocumentMode,
-     *      java.lang.String, java.lang.String, boolean)
+     *      java.lang.String, java.lang.String)
      */
+    protected void documentMode(DocumentMode mode, String publicIdentifier,
+            String systemIdentifier)
+            throws SAXException {
+        if (document instanceof Mode) {
+            Mode modal = (Mode) document;
+            modal.setMode(mode);
+        }
+    }
+
     @Override
+    @Deprecated
     protected void documentMode(DocumentMode mode, String publicIdentifier,
             String systemIdentifier, boolean html4SpecificAdditionalErrorChecks)
             throws SAXException {