diff --git a/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java b/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
index b0f3545..71aa473 100644
--- a/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
+++ b/spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java
@@ -113,7 +113,7 @@ public class ZipTransformer extends AbstractZipTransformer {
 		}
 
 		if (message.getHeaders().containsKey(FileHeaders.FILENAME)) {
-			zipFileName = baseFileName;
+			zipFileName = (String) message.getHeaders().get(FileHeaders.FILENAME);
 		}
 		else {
 			zipFileName = baseFileName + ZIP_EXTENSION;