diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py
index 0182cf86d6..4e568de8c4 100644
--- a/synapse/handlers/user_directory.py
+++ b/synapse/handlers/user_directory.py
@@ -130,8 +130,15 @@ class UserDirectoyHandler(object):
         # We process by going through each existing room at a time.
         room_ids = yield self.store.get_all_rooms()
 
+        logger.info("Doing initial update of user directory. %d rooms", len(room_ids))
+        num_processed_rooms = 1
+
         for room_id in room_ids:
+            logger.info("Handling room %d/%d", num_processed_rooms, len(room_ids))
             yield self._handle_intial_room(room_id)
+            num_processed_rooms += 1
+
+        logger.info("Processed all rooms.")
 
         self.initially_handled_users = None