diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 8fd6b82..2f97c88 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.405")]
-[assembly: AssemblyFileVersion("3.0.1.405")]
+[assembly: AssemblyVersion("3.0.1.406")]
+[assembly: AssemblyFileVersion("3.0.1.406")]
diff --git a/WebApplication/AttachmentManager.ascx.cs b/WebApplication/AttachmentManager.ascx.cs
index 7469aef..bc17ac5 100644
--- a/WebApplication/AttachmentManager.ascx.cs
+++ b/WebApplication/AttachmentManager.ascx.cs
@@ -147,7 +147,7 @@ namespace ScrewTurn.Wiki {
 				row["Editable"] = canUpload && canDelete && (ext == ".jpg" || ext == ".jpeg" || ext == ".png");
 				row["Page"] = CurrentPage.FullName;
 				if(canDownload) {
-					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" +
+					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
 						provider.GetType().FullName + "&IsPageAttachment=1&Page=" +
 						Tools.UrlEncode(CurrentPage.FullName) + "&NoHit=1";
 				}
diff --git a/WebApplication/AttachmentViewer.ascx.cs b/WebApplication/AttachmentViewer.ascx.cs
index 70155b3..3d38add 100644
--- a/WebApplication/AttachmentViewer.ascx.cs
+++ b/WebApplication/AttachmentViewer.ascx.cs
@@ -49,7 +49,7 @@ namespace ScrewTurn.Wiki {
 					DataRow row = table.NewRow();
 					row["Name"] = s;
 					row["Size"] = Tools.BytesToString(provider.GetPageAttachmentDetails(pageInfo, s).Size);
-					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" +
+					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
 						provider.GetType().FullName + "&IsPageAttachment=1&Page=" + Tools.UrlEncode(pageInfo.FullName);
 					table.Rows.Add(row);
 				}
diff --git a/WebApplication/FileManager.ascx.cs b/WebApplication/FileManager.ascx.cs
index 105fa03..5c03f3e 100644
--- a/WebApplication/FileManager.ascx.cs
+++ b/WebApplication/FileManager.ascx.cs
@@ -195,7 +195,7 @@ namespace ScrewTurn.Wiki {
 				row["Size"] = Tools.BytesToString(details.Size);
 				row["WikiMarkupLink"] = "{UP}" + Tools.UrlEncode(s);
 				if(canDownload) {
-					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" +
+					row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
 						provider.GetType().FullName + "&NoHit=1";
 				}
 				else {