diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 63ccdd830..053f546ed 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -42,7 +42,7 @@ Build =
         name:      data.filename + data.ext
         timestamp: "#{data.tim}#{data.ext}"
         url: if boardID is 'f'
-          "//i.4cdn.org/#{boardID}/#{data.filename}#{data.ext}".replace /'/g, '''
+          "//i.4cdn.org/#{boardID}/#{data.filename}#{data.ext}".replace /'/g, '''
         else
           "//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}"
         height:    data.h
@@ -157,7 +157,7 @@ Build =
       shortFilename = a.innerHTML
       # get html
       a.textContent = filename
-      filename      = a.innerHTML.replace /'/g, '''
+      filename      = a.innerHTML.replace /'/g, '''
 
       fileDims = if file.name[-3..] is 'pdf' then 'PDF' else "#{file.width}x#{file.height}"
       fileInfo = "<div class=fileText id=fT#{postID}#{if file.isSpoiler then " title='#{filename}'" else ''}>File: <a href='#{file.url}' target=_blank>#{file.timestamp}</a>" +
diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee
index 951f8ab30..2a8c01fcc 100755
--- a/src/Miscellaneous/FileInfo.coffee
+++ b/src/Miscellaneous/FileInfo.coffee
@@ -26,7 +26,7 @@ FileInfo =
     "#{size} #{unit}"
   escape: (name) ->
     name.replace /[&"'<>]/g, (c) ->
-      {'&': '&amp;', "'": '&apos;', '"': '&quot;', '<': '&lt;', '>': '&gt;'}[c]
+      {'&': '&amp;', "'": '&#39;', '"': '&quot;', '<': '&lt;', '>': '&gt;'}[c]
   formatters:
     t: -> FileInfo.escape @file.URL.match(/\d+\..+$/)[0]
     T: -> "<a href=#{FileInfo.escape @file.URL} target=_blank>#{FileInfo.formatters.t.call @}</a>"