diff --git a/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java b/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java
index be0c295c5..0e7bdf720 100644
--- a/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java
+++ b/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java
@@ -504,7 +504,7 @@ public String getMimeTypeBySuffix(String suffix) {
         } else if (suffix.equals("mp4")) {
             return "video/mp4";
         } else if (suffix.equals("m4v")) {
-            return "video/mp4";
+            return "video/x-m4v";
         } else if (suffix.equals("ogv")) {
             return "video/ogg";
         } else if (suffix.equals("webm")) {
diff --git a/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResourceV101.java b/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResourceV101.java
index 97ad2fa3e..58400886d 100644
--- a/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResourceV101.java
+++ b/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResourceV101.java
@@ -97,7 +97,7 @@ public View getView(String viewId) throws Exception {
         View view = new View();
 
         String range = getEnvironment().getRequest().getHeader("Range");
-        if (range != null) {
+        if (range != null) { // INFO: Also see http://stackoverflow.com/questions/12768812/video-streaming-to-ipad-does-not-work-with-tapestry5, http://balusc.blogspot.ch/2009/02/fileservlet-supporting-resume-and.html
             if(!range.equals("bytes=0-")) {
                 log.warn("Specific range requested for node '" + getRepoPath()+ "': " + range);
                 String[] ranges = range.split("=")[1].split("-");
@@ -546,7 +546,7 @@ public String getMimeTypeBySuffix(String suffix) {
         } else if (suffix.equals("mp4")) {
             return "video/mp4";
         } else if (suffix.equals("m4v")) {
-            return "video/mp4";
+            return "video/x-m4v";
         } else if (suffix.equals("ogv")) {
             return "video/ogg";
         } else if (suffix.equals("webm")) {