diff --git a/4chan_x.user.js b/4chan_x.user.js
index b29f70be6..d27b4147a 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -49,6 +49,7 @@
  *
  * CONTRIBUTORS
  *
+ * desuwa - Firefox filename upload fix
  * seaweed - bottom padding for image hover
  * e000 - cooldown sanity check
  * ahokadesuka - scroll back when unexpanding images
@@ -337,7 +338,11 @@
       }
       $.extend(r, callbacks);
       $.extend(r.upload, upCallbacks);
-      r.send(form);
+      if (typeof form === 'string') {
+        r.sendAsBinary(form);
+      } else {
+        r.send(form);
+      }
       return r;
     },
     cache: function(url, cb) {
@@ -1818,25 +1823,28 @@
         }
       },
       post: function(data) {
-        var bb, callbacks, form, i, l, name, opts, ui8a, url, val;
-        form = new FormData();
-        if (engine === 'gecko' && data.upfile) {
-          l = data.upfile.buffer.length;
-          ui8a = new Uint8Array(l);
-          for (i = 0; 0 <= l ? i < l : i > l; 0 <= l ? i++ : i--) {
-            ui8a[i] = data.upfile.buffer.charCodeAt(i);
-          }
-          bb = new MozBlobBuilder();
-          bb.append(ui8a.buffer);
-          form.append('upfile', bb.getBlob(data.upfile.type), data.upfile.name);
-          delete data.upfile;
-        }
+        var boundary, callbacks, form, name, opts, parts, url, val;
         url = "http://sys.4chan.org/" + data.board + "/post";
         delete data.board;
         delete data.qr;
-        for (name in data) {
-          val = data[name];
-          if (val) form.append(name, val);
+        if (engine === 'gecko' && data.upfile) {
+          boundary = '-------------SMCD' + Date.now();
+          parts = [];
+          parts.push('Content-Disposition: form-data; name="upfile"; filename="' + data.upfile.name + '"\r\n' + 'Content-Type: ' + data.upfile.type + '\r\n\r\n' + data.upfile.buffer + '\r\n');
+          delete data.upfile;
+          for (name in data) {
+            val = data[name];
+            if (val) {
+              parts.push('Content-Disposition: form-data; name="' + name + '"\r\n\r\n' + val + '\r\n');
+            }
+          }
+          form = '--' + boundary + '\r\n' + parts.join('--' + boundary + '\r\n') + '--' + boundary + '--\r\n';
+        } else {
+          form = new FormData();
+          for (name in data) {
+            val = data[name];
+            if (val) form.append(name, val);
+          }
         }
         callbacks = {
           onload: function() {
@@ -1864,6 +1872,11 @@
             }
           }
         };
+        if (boundary) {
+          opts.headers = {
+            'Content-Type': 'multipart/form-data;boundary=' + boundary
+          };
+        }
         return qr.ajax = $.ajax(url, callbacks, opts);
       }
     }
diff --git a/Cakefile b/Cakefile
index b82817a33..da8326b4f 100644
--- a/Cakefile
+++ b/Cakefile
@@ -56,6 +56,7 @@ HEADER  = """
  *
  * CONTRIBUTORS
  *
+ * desuwa - Firefox filename upload fix
  * seaweed - bottom padding for image hover
  * e000 - cooldown sanity check
  * ahokadesuka - scroll back when unexpanding images
diff --git a/changelog b/changelog
index c2b3bede1..f35182ab4 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
 master
+- Mayhem
+  Fix missing image filename uploads. Thanks desuwa.
 
 2.25.0
 - Mayhem
diff --git a/script.coffee b/script.coffee
index 1e16dca38..b49842233 100644
--- a/script.coffee
+++ b/script.coffee
@@ -242,7 +242,7 @@ $.extend $,
       r.setRequestHeader key, val
     $.extend r, callbacks
     $.extend r.upload, upCallbacks
-    r.send form
+    if typeof form is 'string' then r.sendAsBinary form else r.send form
     r
   cache: (url, cb) ->
     if req = $.cache.requests[url]
@@ -1390,28 +1390,27 @@ qr =
           qr.message.post data # Reply object: we're posting
 
     post: (data) ->
-      form = new FormData()
-
-      if engine is 'gecko' and data.upfile
-        # binary string to ArrayBuffer code from Aeosynth's 4chan X
-        l = data.upfile.buffer.length
-        ui8a = new Uint8Array l
-        for i in  [0...l]
-          ui8a[i] = data.upfile.buffer.charCodeAt i
-        bb = new MozBlobBuilder()
-        bb.append ui8a.buffer
-        # https://bugzilla.mozilla.org/show_bug.cgi?id=690659
-        # Firefox does not support assigning a filename when appending a blob to a FormData.
-        form.append 'upfile', bb.getBlob(data.upfile.type), data.upfile.name
-        delete data.upfile
 
       url = "http://sys.4chan.org/#{data.board}/post"
       # Do not append these values to the form.
       delete data.board
       delete data.qr
 
-      for name, val of data
-        form.append name, val if val
+      # File with filename upload fix from desuwa
+      if engine is 'gecko' and data.upfile
+        boundary = '-------------SMCD' + Date.now();
+        parts = []
+        parts.push 'Content-Disposition: form-data; name="upfile"; filename="' + data.upfile.name + '"\r\n' + 'Content-Type: ' + data.upfile.type + '\r\n\r\n' + data.upfile.buffer + '\r\n'
+        delete data.upfile
+
+        for name, val of data
+          parts.push 'Content-Disposition: form-data; name="' + name + '"\r\n\r\n' + val + '\r\n' if val
+        form = '--' + boundary + '\r\n' + parts.join('--' + boundary + '\r\n') + '--' + boundary + '--\r\n';
+
+      else
+        form = new FormData()
+        for name, val of data
+          form.append name, val if val
 
       callbacks =
         onload: ->
@@ -1430,6 +1429,9 @@ qr =
             qr.message.send
               req:      'status'
               progress: "#{Math.round e.loaded / e.total * 100}%"
+      if boundary
+        opts.headers =
+          'Content-Type': 'multipart/form-data;boundary=' + boundary
 
       qr.ajax = $.ajax url, callbacks, opts