diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index d8467b8c3..0516cccf6 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
@@ -106,9 +106,9 @@ public class HSSFPictureData implements PictureData
     public String getMimeType() {
        switch (blip.getRecordId()) {
            case EscherMetafileBlip.RECORD_ID_WMF:
-               return "application/x-wmf";
+               return "image/x-wmf";
            case EscherMetafileBlip.RECORD_ID_EMF:
-               return "application/x-emf";
+               return "image/x-emf";
            case EscherMetafileBlip.RECORD_ID_PICT:
                return "image/x-pict";
            case EscherBitmapBlip.RECORD_ID_PNG:
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
index dcdd8d3bc..481bd556e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
@@ -236,10 +236,10 @@ public final class Picture
         return "image/tiff";
      }
      if("wmf".equals(extension)) {
-        return "application/x-wmf";
+        return "image/x-wmf";
      }
      if("emf".equals(extension)) {
-        return "application/x-emf";
+        return "image/x-emf";
      }
      return "image/unknown";
   }
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
index 946cccbcb..ee34f4b72 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
@@ -79,7 +79,7 @@ public final class TestPictures extends TestCase {
 		assertEquals("png", pics.get(4).suggestFileExtension());
       assertEquals("image/png", pics.get(4).getMimeType());
 		assertEquals("wmf", pics.get(5).suggestFileExtension());
-      assertEquals("application/x-wmf", pics.get(5).getMimeType());
+      assertEquals("image/x-wmf", pics.get(5).getMimeType());
 		assertEquals("jpg", pics.get(6).suggestFileExtension());
       assertEquals("image/jpeg", pics.get(6).getMimeType());
 	}