diff --git a/CMakeLists.txt b/CMakeLists.txt
index f00e4e008..a9bc8b1fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.11")
-set(DFHACK_RELEASE "r3")
+set(DFHACK_RELEASE "r4")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9ae4bb1e4..11494bbe1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -56,16 +56,8 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `buildingplan`: fix choosing the wrong mechanism (or something that isn't a mechanism) when linking a lever and manually choosing a mechanism, but then canceling the selection
-- RemoteServer: don't shut down the socket prematurely, allowing continuing connections from, for example, dfhack-run
-- `sort`: fix potential crash when exiting and re-entering a creatures subtab with a search active
-- `sort`: prevent keyboard keys from affecting the UI when search is active and multiple keys are hit at once
-- `tailor`: fix corner case where existing stock was being ignored, leading to over-ordering
 
 ## Misc Improvements
-- `buildingplan`: save magma safe mechanisms for when magma safety is requested when linking levers and pressure plates to targets
-- `buildingplan`: when choosing mechanisms for linking levers/pressure plates, filter out unreachable mechanisms
-- `sort`: when searching on the Tasks tab, also search the names of the things the task is associated with, such as the name of the stockpile that an item will be stored in
 
 ## Documentation
 
@@ -75,6 +67,20 @@ Template for new versions:
 
 ## Removed
 
+# 50.11-r4
+
+## Fixes
+- `buildingplan`: fix choosing the wrong mechanism (or something that isn't a mechanism) when linking a lever and manually choosing a mechanism, but then canceling the selection
+- RemoteServer: don't shut down the socket prematurely, allowing continuing connections from, for example, dfhack-run
+- `sort`: fix potential crash when exiting and re-entering a creatures subtab with a search active
+- `sort`: prevent keyboard keys from affecting the UI when search is active and multiple keys are hit at once
+- `tailor`: fix corner case where existing stock was being ignored, leading to over-ordering
+
+## Misc Improvements
+- `buildingplan`: save magma safe mechanisms for when magma safety is requested when linking levers and pressure plates to targets
+- `buildingplan`: when choosing mechanisms for linking levers/pressure plates, filter out unreachable mechanisms
+- `sort`: when searching on the Tasks tab, also search the names of the things the task is associated with, such as the name of the stockpile that an item will be stored in
+
 # 50.11-r3
 
 ## New Tools
diff --git a/library/xml b/library/xml
index 45c4430fe..83c329179 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 45c4430fecd671fe96dd8057fc665f2e44e7e8a0
+Subproject commit 83c3291791fa3984bfe17b7cf4843d50221bc22a
diff --git a/scripts b/scripts
index 02ef6cd92..eb73ccaa7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 02ef6cd926254285beb08898bf6ae8a67b0eec32
+Subproject commit eb73ccaa7d336a5bd18b67d37efa6d1aca5368b3