diff --git a/Bundle/pom.xml b/Bundle/pom.xml
index 68f00954..0c347ce0 100644
--- a/Bundle/pom.xml
+++ b/Bundle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.9.3</version>
+        <version>2.9.4</version>
     </parent>
 
     <artifactId>openas2-osgi</artifactId>
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 563973d6..4c251c64 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,19 +1,18 @@
 #              OpenAS2 Server
-#              Version 2.9.3
+#              Version 2.9.4
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 2.9.3
+The OpenAS2 project is pleased to announce the release of OpenAS2 2.9.4
 
-The release download file is: OpenAS2Server-2.9.3.zip
+The release download file is: OpenAS2Server-2.9.4.zip
 
 The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application.
 
-Version 2.9.3 - 2019-09-05
-This is a minior enhancement release:
+Version 2.9.4 - 2019-09-18
+This is a minior bugfix release:
        **IMPORTANT NOTE**: Please review upgrade notes if you are upgrading
 
-  1. Allowed defining a custom fallback file name for received fiels where partner does not send file name. See section 6.3 of the OpenAS2HowTo and the as2_receive_message_filename_fallback attribute.
-  2. Upgraded BouncyCastle libraries to 1.62 to support Java 12
+  1. Clean sent/error file names for file system compatibility
  
 ##Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
diff --git a/Remote/pom.xml b/Remote/pom.xml
index 9aeaaf9a..d37618f3 100644
--- a/Remote/pom.xml
+++ b/Remote/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>2.9.3</version>
+        <version>2.9.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/Server/pom.xml b/Server/pom.xml
index 17767468..ac0b5625 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -7,7 +7,7 @@
         <!-- DO NOT CHANGE THIS "groupId" WITHOUT CHANGING XMLSession.getManifestAttributes.MANIFEST_VENDOR_ID_ATTRIB -->
 		<groupId>net.sf.openas2</groupId>
 		<artifactId>OpenAS2</artifactId>
-		<version>2.9.3</version>
+		<version>2.9.4</version>
 	</parent>
 
 	<artifactId>openas2-server</artifactId>
diff --git a/Server/src/main/java/org/openas2/util/AS2Util.java b/Server/src/main/java/org/openas2/util/AS2Util.java
index 7de3cc52..adfa8485 100644
--- a/Server/src/main/java/org/openas2/util/AS2Util.java
+++ b/Server/src/main/java/org/openas2/util/AS2Util.java
@@ -736,6 +736,7 @@ public static void cleanupFiles(Message msg, boolean isError) {
 				    .add("rand", new RandomParameters());
 			    tgtFileName = ParameterParser.parse(targetFilenameUnparsed, parser);
 			}
+			tgtFileName = IOUtil.cleanFilename(tgtFileName);
 			tgtFile = new File(tgtDir + "/" + tgtFileName);
 			tgtFile = IOUtil.moveFile(fPendingFile, tgtFile, false);
 			isMoved = true;
diff --git a/changes.txt b/changes.txt
index 1966aa9f..495c58aa 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,9 @@
+Version 2.9.4 - 2019-09-18
+This is a minior bugfix release:
+       **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
+
+  1. Clean sent/error file names for file system compatibility
+
 Version 2.9.3 - 2019-09-05
 This is a minior enhancement release:
        **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
diff --git a/pom.xml b/pom.xml
index 96f4adf6..04b151e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.sf.openas2</groupId>
 	<artifactId>OpenAS2</artifactId>
-	<version>2.9.3</version>
+	<version>2.9.4</version>
 	<name>OpenAS2</name>
 	<packaging>pom</packaging>