diff --git a/scripts/app_engine_server/memcache_zipserve.py b/scripts/app_engine_server/memcache_zipserve.py
index bda33c0de..15cbb1ee7 100644
--- a/scripts/app_engine_server/memcache_zipserve.py
+++ b/scripts/app_engine_server/memcache_zipserve.py
@@ -341,6 +341,14 @@ class MemcachedZipHandler(webapp.RequestHandler):
       self.response.headers['Content-Type'] = 'image/svg+xml'
       self.SetCachingHeaders(mustRevalidate)
       self.response.out.write(resp_data)
+    elif name.endswith('.mp4'):
+      self.response.headers['Content-Type'] = 'video/mp4'
+      self.SetCachingHeaders(mustRevalidate)
+      self.response.out.write(resp_data)
+    elif name.endswith('.webm'):
+      self.response.headers['Content-Type'] = 'video/webm'
+      self.SetCachingHeaders(mustRevalidate)
+      self.response.out.write(resp_data)
     return True
 
   def GetFromStore(self, file_path):