diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 0b21b72eab..05e37d2ab8 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -362,6 +362,7 @@ patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value fo
 patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
 patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
 patch.updateMimetypes3.description=Fix mimetype for MPEG Audio
+patch.updateMimetypes4.description=Rationalise mimetypes for PhotoShop and AutoCad
 
 patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
 
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index f2d529ab5b..d8b0a82a0f 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3052,4 +3052,40 @@
         <property name="fileFolderService" ref="FileFolderService"/>
     </bean>
 
+    <bean id="patch.updateMimetypes4" class="org.alfresco.repo.admin.patch.impl.GenericMimetypeRenamePatch" parent="basePatch" >
+        <property name="id"><value>patch.updateMimetypes4</value></property>
+        <property name="description"><value>patch.updateMimetypes4.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>5019</value></property>
+        <property name="targetSchema"><value>5020</value></property>
+        <property name="applyToTenants"><value>false</value></property>
+        <property name="dependsOn">
+            <list>
+                <ref bean="patch.db-V3.2-ContentTables2"/>
+            </list>
+        </property>
+        <property name="mimetypeDAO">
+            <ref bean="mimetypeDAO"/>
+        </property>
+        <property name="patchDAO">
+            <ref bean="patchDAO"/>
+        </property>
+        <property name="nodeService">
+            <ref bean="nodeService" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="indexerAndSearcherFactory"/>
+        </property>
+        <property name="mimetypeMappings">
+            <map>
+                <entry key="image/x-dwg" value="image/vnd.dwg" />
+                <entry key="application/dwg" value="image/vnd.dwg" />
+                <entry key="application/photoshop" value="image/vnd.adobe.photoshop" />
+            </map>
+        </property>
+        <property name="reindex">
+            <value>true</value>
+        </property>
+    </bean>
+    
 </beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 51c83ed959..9bd3329568 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=5019
+version.schema=5020
diff --git a/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
index 59ad25db8f..937aee9634 100644
--- a/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
+++ b/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
@@ -160,6 +160,10 @@ public abstract class AbstractImageMagickContentTransformerWorker extends Conten
         {
             return false;   // svg extension doesn't work
         }
+        else if (mimetype.equals(MimetypeMap.MIMETYPE_IMG_DWG))
+        {
+            return false;   // dwg extension doesn't work
+        }
         else
         {
             return true;