diff --git a/.gitignore b/.gitignore
index 9a95231c7..36c1efd87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ public/js/config.js
 # ignore webpack build
 public/build
 public/views/build
+
+public/uploads/*
+!public/uploads/.gitkeep
diff --git a/app.js b/app.js
index adb7f81fb..30baf1ca3 100644
--- a/app.js
+++ b/app.js
@@ -405,6 +405,9 @@ app.get('/me', function (req, res) {
 //upload to imgur
 app.post('/uploadimage', function (req, res) {
     var form = new formidable.IncomingForm();
+    form.uploadDir = "public/uploads";
+    form.keepExtensions = true;
+
     form.parse(req, function (err, fields, files) {
         if (err || !files.image || !files.image.path) {
             response.errorForbidden(res);
diff --git a/public/uploads/.gitkeep b/public/uploads/.gitkeep
new file mode 100644
index 000000000..e69de29bb