diff --git a/synapse/rest/profile.py b/synapse/rest/profile.py
index 2f010c0182..e454ca4661 100644
--- a/synapse/rest/profile.py
+++ b/synapse/rest/profile.py
@@ -21,6 +21,26 @@ from base import RestServlet, client_path_pattern
 import json
 
 
+class ProfileRestServlet(RestServlet):
+    PATTERN = client_path_pattern("/profile/(?P<user_id>[^/]*)")
+
+    @defer.inlineCallbacks
+    def on_GET(self, request, user_id):
+        user = self.hs.parse_userid(user_id)
+
+        displayname = yield self.handlers.profile_handler.get_displayname(
+            user,
+        )
+        avatar_url = yield self.handlers.profile_handler.get_avatar_url(
+            user,
+        )
+
+        defer.returnValue((200, {
+                                    "displayname": displayname,
+                                    "avatar_url": avatar_url
+                                }))
+
+
 class ProfileDisplaynameRestServlet(RestServlet):
     PATTERN = client_path_pattern("/profile/(?P<user_id>[^/]*)/displayname")
 
@@ -88,5 +108,6 @@ class ProfileAvatarURLRestServlet(RestServlet):
 
 
 def register_servlets(hs, http_server):
+    ProfileRestServlet(hs).register(http_server)
     ProfileDisplaynameRestServlet(hs).register(http_server)
     ProfileAvatarURLRestServlet(hs).register(http_server)