diff --git a/public/language/en-GB/global.json b/public/language/en-GB/global.json
index 1195d792a0..14d9b13421 100644
--- a/public/language/en-GB/global.json
+++ b/public/language/en-GB/global.json
@@ -122,6 +122,7 @@
 	"enter_page_number": "Enter page number",
 	"upload_file": "Upload file",
 	"upload": "Upload",
+	"uploads": "Uploads",
 	"allowed-file-types": "Allowed file types are %1",
 
 	"unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
diff --git a/public/language/en-GB/pages.json b/public/language/en-GB/pages.json
index 70f6cc24a3..1a7f23eace 100644
--- a/public/language/en-GB/pages.json
+++ b/public/language/en-GB/pages.json
@@ -55,6 +55,7 @@
 	"account/upvoted": "Posts upvoted by %1",
 	"account/downvoted": "Posts downvoted by %1",
 	"account/best": "Best posts made by %1",
+	"account/uploads": "Uploads by %1",
 
 	"confirm": "Email Confirmed",
 
diff --git a/public/language/en-GB/uploads.json b/public/language/en-GB/uploads.json
index 8cf9487901..bf916b8a42 100644
--- a/public/language/en-GB/uploads.json
+++ b/public/language/en-GB/uploads.json
@@ -2,5 +2,6 @@
 	"uploading-file" : "Uploading the file...",
 	"select-file-to-upload": "Select a file to upload!",
 	"upload-success": "File uploaded successfully!",
-	"maximum-file-size": "Maximum %1 kb"
+	"maximum-file-size": "Maximum %1 kb",
+	"no-uploads-found": "No uploads found"
 }
\ No newline at end of file
diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index a7aa1716b4..465d387eb7 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -11,6 +11,7 @@ var accountsController = {
 	notifications: require('./accounts/notifications'),
 	chats: require('./accounts/chats'),
 	session: require('./accounts/session'),
+	uploads: require('./accounts/uploads'),
 };
 
 module.exports = accountsController;
diff --git a/src/controllers/accounts/uploads.js b/src/controllers/accounts/uploads.js
new file mode 100644
index 0000000000..ee0825c623
--- /dev/null
+++ b/src/controllers/accounts/uploads.js
@@ -0,0 +1,53 @@
+'use strict';
+
+
+var async = require('async');
+
+var db = require('../../database');
+var helpers = require('../helpers');
+var pagination = require('../../pagination');
+var accountHelpers = require('./helpers');
+
+var uploadsController = module.exports;
+
+uploadsController.get = function (req, res, callback) {
+	var userData;
+
+	var page = Math.max(1, parseInt(req.query.page, 10) || 1);
+	var itemsPerPage = 25;
+
+	async.waterfall([
+		function (next) {
+			accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
+		},
+		function (_userData, next) {
+			userData = _userData;
+			if (!userData) {
+				return callback();
+			}
+
+			var start = (page - 1) * itemsPerPage;
+			var stop = start + itemsPerPage - 1;
+			async.parallel({
+				itemCount: function (next) {
+					db.sortedSetCard('uid:' + userData.uid + ':uploads', next);
+				},
+				uploadUrls: function (next) {
+					db.getSortedSetRevRange('uid:' + userData.uid + ':uploads', start, stop, next);
+				},
+			}, next);
+		},
+		function (results) {
+			userData.uploads = results.uploadUrls.map(function (url) {
+				return {
+					url: url,
+				};
+			});
+			var pageCount = Math.ceil(results.itemCount / itemsPerPage);
+			userData.pagination = pagination.create(page, pageCount, req.query);
+			userData.title = '[[pages:account/uploads, ' + userData.username + ']]';
+			userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: '/user/' + userData.userslug }, { text: '[[global:uploads]]' }]);
+			res.render('account/uploads', userData);
+		},
+	], callback);
+};
diff --git a/src/routes/accounts.js b/src/routes/accounts.js
index 5c040b6af1..7d4bd7a578 100644
--- a/src/routes/accounts.js
+++ b/src/routes/accounts.js
@@ -29,6 +29,7 @@ module.exports = function (app, middleware, controllers) {
 	setupPageRoute(app, '/user/:userslug/edit/password', middleware, accountMiddlewares, controllers.accounts.edit.password);
 	setupPageRoute(app, '/user/:userslug/info', middleware, accountMiddlewares, controllers.accounts.info.get);
 	setupPageRoute(app, '/user/:userslug/settings', middleware, accountMiddlewares, controllers.accounts.settings.get);
+	setupPageRoute(app, '/user/:userslug/uploads', middleware, accountMiddlewares, controllers.accounts.uploads.get);
 
 	app.delete('/api/user/:userslug/session/:uuid', [middleware.exposeUid, middleware.ensureSelfOrGlobalPrivilege], controllers.accounts.session.revoke);