diff --git a/anki/media.py b/anki/media.py
index 731254706..e3822b94c 100644
--- a/anki/media.py
+++ b/anki/media.py
@@ -48,7 +48,7 @@ mediaDeletedTable = Table(
 def mediaFilename(path):
     "Return checksum.ext for path"
     new = checksum(open(path, "rb").read())
-    ext = os.path.splitext(path)[1]
+    ext = os.path.splitext(path)[1].lower()
     return "%s%s" % (new, ext)
 
 def copyToMedia(deck, path):
diff --git a/anki/sync.py b/anki/sync.py
index 77b914ff5..7ab4be3bf 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -1074,7 +1074,7 @@ class BulkMediaSyncerProxy(HttpSyncServerProxy):
         return self.unstuff(self.runCmd("missingMedia"))
 
     def _splitMedia(self, fname):
-        return os.path.join(fname[0:1], fname[0:2], fname)
+        return "%s/%s/%s" % (fname[0:1], fname[0:2], fname)
 
     def _relativeMediaPath(self, fname):
         return "http://ankimedia.ichi2.net/%s" % (