diff --git a/docs/changelog.txt b/docs/changelog.txt
index 21065a9d4..c947797f7 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - `embark-assistant`: fixed order of factors when calculating min temperature
 - `embark-assistant`: improved performance of surveying
+- `quickfort`: creating zones no longer causes eventual crashes
 
 ## Misc Improvements
 - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g.  ``buildingplan set boulders false``
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 5a0cd37dc..3dab347d5 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -881,7 +881,7 @@ static void linkRooms(df::building *bld)
     for (size_t i = 0; i < vec.size(); i++)
     {
         auto room = vec[i];
-        if (!room->is_room || room->z != bld->z)
+        if (!room->is_room || room->z != bld->z || room == bld)
             continue;
 
         df::building_extents_type *pext = getExtentTile(room->room, df::coord2d(bld->x1, bld->y1));