diff --git a/CMakeLists.txt b/CMakeLists.txt
index f07cdf5af..3e91ed16a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.05")
-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 8bd2cbb57..a325d73d6 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,22 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+
+## Removed
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+# 0.47.05-r4
+
 ## Fixes
 - `blueprint`: fixed passing incorrect parameters to `gui/blueprint` when you run ``blueprint gui`` with optional params
 - `blueprint`: key sequences for constructed walls and down stairs are now correct
diff --git a/library/xml b/library/xml
index b1637f68e..adfd3a913 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b1637f68e920dcb4a68a1e727a5ea5bf193b131f
+Subproject commit adfd3a9137979cbd42e0f69b4b0b7f32b2e05013
diff --git a/scripts b/scripts
index 85d98b1db..ff95ef37b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 85d98b1db11dd3177ff0cc5dc34db129f412257b
+Subproject commit ff95ef37b15320e9a4a2dd871c24eb9820a8c42b