diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 2d5617f8f0..65f7f008f6 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -259,6 +259,24 @@ export const CommandMap = {
         category: CommandCategories.actions,
     }),
 
+    roomavatar: new Command({
+        name: 'roomavatar',
+        args: '[<mxc_url>]',
+        description: _td('Changes the avatar of the current room'),
+        runFn: function(roomId, args) {
+            let promise = Promise.resolve(args);
+            if (!args) {
+                promise = singleMxcUpload();
+            }
+
+            return success(promise.then((url) => {
+                if (!url) return;
+                return MatrixClientPeg.get().sendStateEvent(this.props.roomId, 'm.room.avatar', {url}, '');
+            }));
+        },
+        category: CommandCategories.actions,
+    }),
+
     myroomavatar: new Command({
         name: 'myroomavatar',
         args: '[<mxc_url>]',