diff --git a/src/Handler/Zip.hs b/src/Handler/Zip.hs
index 67a8f62b3..a4b49f461 100644
--- a/src/Handler/Zip.hs
+++ b/src/Handler/Zip.hs
@@ -65,7 +65,7 @@ consumeZip handleEntry = Zip.unZipStream `fuseBoth` consumeZip'
           zipEntryName' <- fmap Text.unpack . either throw return . Text.decodeUtf8' $ Zip.zipEntryName e
           contentChunks <- accContents
           let
-            zipEntryName = normalise $ dropTrailingPathSeparator zipEntryName'
+            zipEntryName = normalise . makeValid $ dropTrailingPathSeparator zipEntryName'
             zipEntryTime = localTimeToUTC utc $ Zip.zipEntryTime e
             zipEntryContents
               | hasTrailingPathSeparator zipEntryName' = Nothing
@@ -101,6 +101,6 @@ produceZip info = Conduit.map toZipData =$= void (Zip.zipStream zipOptions)
     toZipEntry :: Bool -- ^ Is directory?
                -> ZipEntry -> Zip.ZipEntry
     toZipEntry isDir ZipEntry{..} = Zip.ZipEntry
-      { zipEntryName = Text.encodeUtf8 . Text.pack . bool dropTrailingPathSeparator addTrailingPathSeparator isDir . normalise $ zipEntryName
+      { zipEntryName = Text.encodeUtf8 . Text.pack . normalise . makeValid . bool dropTrailingPathSeparator addTrailingPathSeparator isDir $ zipEntryName
       , zipEntryTime = utcToLocalTime utc zipEntryTime
       }
diff --git a/test/Handler/ZipSpec.hs b/test/Handler/ZipSpec.hs
index 681041b3a..6cd6b43a2 100644
--- a/test/Handler/ZipSpec.hs
+++ b/test/Handler/ZipSpec.hs
@@ -16,7 +16,7 @@ import Data.Conduit.Binary (sourceLbs, sinkLbs)
 
 instance Arbitrary ZipEntry where
   arbitrary = do
-    zipEntryName <- normalise . dropTrailingPathSeparator . joinPath <$> arbitrary
+    zipEntryName <- joinPath <$> arbitrary
     zipEntryTime <- arbitrary
     zipEntryContents <- arbitrary
     return ZipEntry{..}
@@ -27,4 +27,7 @@ spec = describe "Zip file handling" $ do
     \zipFiles -> do
       bs <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= sinkLbs
       (_, zipFiles') <- runConduit $ sourceLbs bs =$= consumeZip return
-      zipFiles' `shouldBe` zipFiles
+      forM_ (zip zipFiles zipFiles') $ \(file, file') -> do
+        (shouldBe `on` normalise . makeValid . dropTrailingPathSeparator) (zipEntryName file') (zipEntryName file)
+        -- (zipEntryTime file') `shouldBe` (zipEntryTime file)
+        (zipEntryContents file') `shouldBe` (zipEntryContents file)