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 de848bf4ff..0be9ddc5e2 100644
--- a/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
+++ b/source/java/org/alfresco/repo/content/transform/magick/AbstractImageMagickContentTransformerWorker.java
@@ -137,7 +137,13 @@ public abstract class AbstractImageMagickContentTransformerWorker extends Conten
      */
     public static boolean isSupported(String mimetype)
     {
-        if (!mimetype.startsWith(MIMETYPE_IMAGE_PREFIX))
+        // ImageMagick supports the transformation of Encapsulated PostScript images,
+        // whose MIME type is defined in mimetype-map.xml as "application/eps".
+        if (mimetype.equals(MimetypeMap.MIMETYPE_APPLICATION_EPS))
+        {
+            return true; // This is an image although it doesn't start with "image/"
+        }
+        else if (!mimetype.startsWith(MIMETYPE_IMAGE_PREFIX))
         {
             return false;   // not an image
         }
diff --git a/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
index 73e6c3a7e7..da8af4b396 100644
--- a/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
+++ b/source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerWorker.java
@@ -60,6 +60,7 @@ public class ImageMagickContentTransformerWorker extends AbstractImageMagickCont
      */
     public ImageMagickContentTransformerWorker()
     {
+        // Intentionally empty
     }
     
     /**
@@ -142,6 +143,7 @@ public class ImageMagickContentTransformerWorker extends AbstractImageMagickCont
     /**
      * Transform the image content from the source file to the target file
      */
+    @Override
     protected void transformInternal(File sourceFile, File targetFile, TransformationOptions options) throws Exception
     {
         Map<String, String> properties = new HashMap<String, String>(5);
diff --git a/source/test-resources/quick/quick.eps b/source/test-resources/quick/quick.eps
new file mode 100644
index 0000000000..688f327d45
Binary files /dev/null and b/source/test-resources/quick/quick.eps differ