Index: /FCKeditor.Net/trunk/AssemblyInfo.cs
===================================================================
--- /FCKeditor.Net/trunk/AssemblyInfo.cs	(revision 5851)
+++ /FCKeditor.Net/trunk/AssemblyInfo.cs	(revision 5852)
@@ -40,5 +40,5 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FCKeditor.FCKeditorV2")]
-[assembly: AssemblyCopyright("2003-2008 Frederico Caldeira Knabben")]
+[assembly: AssemblyCopyright("2003-2010, CKSource - Frederico Knabben")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55,5 +55,5 @@
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.6.3.*")]
+[assembly: AssemblyVersion("2.6.4.*")]
 
 //
Index: /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs
===================================================================
--- /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs	(revision 5851)
+++ /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs	(revision 5852)
@@ -69,7 +69,8 @@
 			int iCounter = 0;
 
+			string orginalNameWithoutExt = System.IO.Path.GetFileNameWithoutExtension(sFileName);
 			while ( true )
 			{
-				string sFilePath = System.IO.Path.Combine( sServerDir, sFileName );
+                string sFilePath = System.IO.Path.Combine( sServerDir, sFileName );
 
 				if ( System.IO.File.Exists( sFilePath ) )
@@ -77,5 +78,5 @@
 					iCounter++;
 					sFileName =
-						System.IO.Path.GetFileNameWithoutExtension( oFile.FileName ) +
+						orginalNameWithoutExt +
 						"(" + iCounter + ")." +
 						sExtension;
Index: /FCKeditor.Net/trunk/_whatsnew.html
===================================================================
--- /FCKeditor.Net/trunk/_whatsnew.html	(revision 5851)
+++ /FCKeditor.Net/trunk/_whatsnew.html	(revision 5852)
@@ -35,4 +35,9 @@
 	<h3>
 		SVN</h3>
+	<ul><li></li></ul>
+	<h3>
+		Version 2.6.4</h3>
+		<li><strong>Security release, upgrade is highly recommended</strong>.</li>
+		
 	<p>
 		Fixed Bugs:</p>