diff --git a/ChangeLog b/ChangeLog
index fe1a6f225..78d0d5119 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,7 @@ release 0.14.7
 	* fixed deadlock in natpmp
 	* resume data alerts are always posted, regardless of alert mask
 	* added wait_for_alert to python binding
+	* improved invalid filename character replacement
 
 release 0.14.6
 
diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp
index f5985b3e1..66970457d 100644
--- a/src/torrent_info.cpp
+++ b/src/torrent_info.cpp
@@ -83,7 +83,7 @@ namespace libtorrent
 	bool valid_path_character(char c)
 	{
 #ifdef TORRENT_WINDOWS
-		static const char invalid_chars[] = "&?<>\"|\b*:+";
+		static const char invalid_chars[] = "?<>\"|\b*:";
 #else
 		static const char invalid_chars[] = "";
 #endif
@@ -111,7 +111,7 @@ namespace libtorrent
 				}
 				else
 				{
-					tmp_path += '.';
+					tmp_path += '_';
 					valid_encoding = false;
 				}
 				continue;