diff --git a/source/java/org/alfresco/repo/content/MimetypeMap.java b/source/java/org/alfresco/repo/content/MimetypeMap.java
index ea1b5adfcf..d5490136f9 100644
--- a/source/java/org/alfresco/repo/content/MimetypeMap.java
+++ b/source/java/org/alfresco/repo/content/MimetypeMap.java
@@ -63,7 +63,7 @@ public class MimetypeMap implements MimetypeService
     public static final String MIMETYPE_BINARY = "application/octet-stream";
     public static final String MIMETYPE_PPT = "application/vnd.ms-powerpoint";
     public static final String MIMETYPE_APP_DWG = "application/dwg";
-    public static final String MIMETYPE_IMG_DWG = "image/x-dwg";
+    public static final String MIMETYPE_IMG_DWG = "image/vnd.dwg";
     public static final String MIMETYPE_FLASH = "application/x-shockwave-flash";
     public static final String MIMETYPE_IMAGE_GIF = "image/gif";
     public static final String MIMETYPE_IMAGE_JPEG = "image/jpeg";
diff --git a/source/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
index 8b78062d54..5da581077c 100644
--- a/source/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/DWGMetadataExtracter.java
@@ -65,6 +65,7 @@ public class DWGMetadataExtracter extends AbstractMappingMetadataExtracter
     public static String[] SUPPORTED_MIMETYPES = new String[] {
             MimetypeMap.MIMETYPE_APP_DWG,
             MimetypeMap.MIMETYPE_IMG_DWG,
+            "image/x-dwg", // Was used before IANA registration
     };
     
     public DWGMetadataExtracter()