diff --git a/HTTP_Downloader/HTTP_Downloader.rc b/HTTP_Downloader/HTTP_Downloader.rc
index d056462..25603a6 100644
--- a/HTTP_Downloader/HTTP_Downloader.rc
+++ b/HTTP_Downloader/HTTP_Downloader.rc
@@ -63,8 +63,8 @@ IDI_ICON_TRAY           ICON                    "icon_tray.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,6,0
- PRODUCTVERSION 1,0,6,0
+ FILEVERSION 1,0,6,1
+ PRODUCTVERSION 1,0,6,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -81,12 +81,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "HTTP Downloader is made free under the GPLv3 license."
             VALUE "FileDescription", "HTTP Downloader can download files through HTTP(S), FTP(S), and SFTP connections."
-            VALUE "FileVersion", "1, 0, 6, 0"
+            VALUE "FileVersion", "1, 0, 6, 1"
             VALUE "InternalName", "HTTP Downloader"
             VALUE "LegalCopyright", "Copyright © 2015-2024 Eric Kutcher"
             VALUE "OriginalFilename", "HTTP_Downloader.exe"
             VALUE "ProductName", "HTTP Downloader"
-            VALUE "ProductVersion", "1, 0, 6, 0"
+            VALUE "ProductVersion", "1, 0, 6, 1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/HTTP_Downloader/changelog.txt b/HTTP_Downloader/changelog.txt
index 62e64da..f1e6848 100644
--- a/HTTP_Downloader/changelog.txt
+++ b/HTTP_Downloader/changelog.txt
@@ -1,3 +1,8 @@
+Version:	1.0.6.1
+Released:	2024-06-12
+
+Fixed regression with Content-Disposition attachment names.
+
 Version:	1.0.6.0
 Released:	2024-06-08
 
diff --git a/HTTP_Downloader/dm_version.txt b/HTTP_Downloader/dm_version.txt
index f2f9ac4..d66ec34 100644
--- a/HTTP_Downloader/dm_version.txt
+++ b/HTTP_Downloader/dm_version.txt
@@ -1,4 +1,4 @@
-16778752
-https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.0/HTTP_Downloader_DM_32.zip
-16778752
-https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.0/HTTP_Downloader_DM_64.zip
+16778753
+https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.1/HTTP_Downloader_DM_32.zip
+16778753
+https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.1/HTTP_Downloader_DM_64.zip
diff --git a/HTTP_Downloader/globals.h b/HTTP_Downloader/globals.h
index dca6586..004d4de 100644
--- a/HTTP_Downloader/globals.h
+++ b/HTTP_Downloader/globals.h
@@ -109,7 +109,7 @@
 #define CURRENT_VERSION_A	1
 #define CURRENT_VERSION_B	0
 #define CURRENT_VERSION_C	6
-#define CURRENT_VERSION_D	0
+#define CURRENT_VERSION_D	1
 
 #define CURRENT_VERSION		( ( CURRENT_VERSION_A << 24 ) | \
 							  ( CURRENT_VERSION_B << 16 ) | \
diff --git a/HTTP_Downloader/http_parsing.cpp b/HTTP_Downloader/http_parsing.cpp
index cfb7c40..bb542b2 100644
--- a/HTTP_Downloader/http_parsing.cpp
+++ b/HTTP_Downloader/http_parsing.cpp
@@ -2856,11 +2856,13 @@ char ParseHTTPHeader( SOCKET_CONTEXT *context, char *header_buffer, unsigned int
 			{
 				// Remove directory paths.
 				char *tmp_filename = filename;
-				while ( filename_length > 0 )
+				unsigned int tmp_filename_length = filename_length;
+				while ( tmp_filename_length > 0 )
 				{
-					if ( filename[ --filename_length ] == '\\' || filename[ filename_length ] == '/' )
+					if ( filename[ --tmp_filename_length ] == '\\' || filename[ tmp_filename_length ] == '/' )
 					{
-						tmp_filename = filename + ( filename_length + 1 );
+						tmp_filename = filename + ( tmp_filename_length + 1 );
+						filename_length -= ( tmp_filename_length + 1 );
 						break;
 					}
 				}
diff --git a/HTTP_Downloader/version.txt b/HTTP_Downloader/version.txt
index 3eeea86..b0d309a 100644
--- a/HTTP_Downloader/version.txt
+++ b/HTTP_Downloader/version.txt
@@ -1,4 +1,4 @@
-16778752
-https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.0/HTTP_Downloader_32.zip
-16778752
-https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.0/HTTP_Downloader_64.zip
+16778753
+https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.1/HTTP_Downloader_32.zip
+16778753
+https://github.com/erickutcher/httpdownloader/releases/download/v1.0.6.1/HTTP_Downloader_64.zip