diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index c9a2f148d..6af8259be 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -415,8 +415,15 @@ def run(hs):
         stats["timestamp"] = now
         stats["uptime_seconds"] = uptime
         stats["total_users"] = yield hs.get_datastore().count_all_users()
+        stats["total_users"] = yield hs.get_datastore().count_nonbridged_users()
+
+        room_count = yield hs.get_datastore().get_room_count()
+        stats["total_room_count"] = room_count
+
         stats["daily_active_users"] = yield hs.get_datastore().count_daily_users()
+        stats["daily_active_rooms"] = yield hs.get_datastore().count_daily_active_rooms()
         stats["daily_messages"] = yield hs.get_datastore().count_daily_messages()
+
         daily_sent_messages = yield hs.get_datastore().count_daily_sent_messages()
         stats["daily_sent_messages"] = daily_sent_messages
 
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 8e7ae73a7..f29d71589 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1631,6 +1631,21 @@ class EventsStore(SQLBaseStore):
         ret = yield self.runInteraction("count_daily_sent_messages", _count_messages)
         defer.returnValue(ret)
 
+    @defer.inlineCallbacks
+    def count_daily_active_rooms(self):
+        def _count(txn):
+            sql = """
+                SELECT COALESCE(COUNT(DISTINCT room_id), 0) FROM events
+                WHERE type = 'm.room.message'
+                AND stream_ordering > ?
+            """
+            txn.execute(sql, (self.stream_ordering_day_ago,))
+            count, = txn.fetchone()
+            return count
+
+        ret = yield self.runInteraction("count_daily_active_rooms", _count)
+        defer.returnValue(ret)
+
     @defer.inlineCallbacks
     def _background_reindex_fields_sender(self, progress, batch_size):
         target_min_stream_id = progress["target_min_stream_id_inclusive"]
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index ec2c52ab9..20acd58fc 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -437,6 +437,19 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
         ret = yield self.runInteraction("count_users", _count_users)
         defer.returnValue(ret)
 
+    @defer.inlineCallbacks
+    def count_nonbridged_users(self):
+        def _count_users(txn):
+            txn.execute("""
+                SELECT COALESCE(COUNT(*), 0) FROM users
+                WHERE appservice_id IS NULL
+            """)
+            count, = txn.fetchone()
+            return count
+
+        ret = yield self.runInteraction("count_users", _count_users)
+        defer.returnValue(ret)
+
     @defer.inlineCallbacks
     def find_next_generated_user_id_localpart(self):
         """