diff --git a/source/java/org/alfresco/repo/content/MimetypeMap.java b/source/java/org/alfresco/repo/content/MimetypeMap.java
index 9f75b5e193..eae9b9036e 100644
--- a/source/java/org/alfresco/repo/content/MimetypeMap.java
+++ b/source/java/org/alfresco/repo/content/MimetypeMap.java
@@ -44,6 +44,7 @@ public class MimetypeMap implements MimetypeService
     public static final String MIMETYPE_TEXT_CSS = "text/css";    
     public static final String MIMETYPE_XML = "text/xml";
     public static final String MIMETYPE_HTML = "text/html";
+    public static final String MIMETYPE_XHTML = "application/xhtml+xml";
     public static final String MIMETYPE_PDF = "application/pdf";
     public static final String MIMETYPE_WORD = "application/msword";
     public static final String MIMETYPE_EXCEL = "application/vnd.excel";
diff --git a/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
index 9530b21626..84021d805f 100644
--- a/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
@@ -22,7 +22,9 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.text.ChangedCharSetException;
 import javax.swing.text.MutableAttributeSet;
@@ -35,8 +37,6 @@ import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.namespace.QName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * 
@@ -44,12 +44,16 @@ import org.apache.commons.logging.LogFactory;
  */
 public class HtmlMetadataExtracter extends AbstractMetadataExtracter
 {
-
-    private static final Log logger = LogFactory.getLog(HtmlMetadataExtracter.class);
+    private static final Set<String> MIMETYPES = new HashSet<String>(5);
+    static
+    {
+        MIMETYPES.add(MimetypeMap.MIMETYPE_HTML);
+        MIMETYPES.add(MimetypeMap.MIMETYPE_XHTML);
+    }
 
     public HtmlMetadataExtracter()
     {
-        super(MimetypeMap.MIMETYPE_HTML, 1.0, 1000);
+        super(MIMETYPES, 1.0, 1000);
     }
 
     public void extract(ContentReader reader, Map<QName, Serializable> destination) throws ContentIOException
@@ -95,7 +99,7 @@ public class HtmlMetadataExtracter extends AbstractMetadataExtracter
                     {
                         inHead = false;
                     }
-                    else if (HTML.Tag.TITLE.equals(t))
+                    else if (HTML.Tag.TITLE.equals(t) && title != null)
                     {
                         trimPut(ContentModel.PROP_TITLE, title.toString(), tempDestination);
                         title = null;