diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1088325bb07151c48d403478614034163c102788..18f69a71461ffd5d0623be0814ced45f91fbfeeb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -28,6 +28,7 @@ Added
 * Notification drawer in top nav bar
 * GraphQL queries and mutations for core data management
 * [Dev] Introduce new mechanism to register classes over all apps.
+* Data template for `room` model used for haystack search indexing moved to core.
 
 Changed
 ~~~~~~~
diff --git a/aleksis/core/templates/search/indexes/core/room_text.txt b/aleksis/core/templates/search/indexes/core/room_text.txt
new file mode 100644
index 0000000000000000000000000000000000000000..165c30e8c240ddecc872520626cccb598a6ad7a0
--- /dev/null
+++ b/aleksis/core/templates/search/indexes/core/room_text.txt
@@ -0,0 +1,2 @@
+{{ object.name }}
+{{ object.short_name }}