diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44d6a02ce..cd06587eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r1")
+set(DFHACK_RELEASE "r2")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index f147e2a67..9317df86e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+# 0.47.04-r2
+
 ## New Tweaks
 - `tweak` do-job-now: adds a job priority toggle to the jobs list
 - `tweak` reaction-gloves: adds an option to make reactions produce gloves in sets with correct handedness
diff --git a/library/xml b/library/xml
index 23e076b70..036b662a1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 23e076b7079a48b91c59451be64319dd36476994
+Subproject commit 036b662a1bbc96b4911f3cbe74dfa1243b6459bc
diff --git a/scripts b/scripts
index 385950715..568c586ce 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 385950715a4cd8b62d57bf35d7e25c4025fd3f25
+Subproject commit 568c586ce2474af89c64a4cc7c876edb35931d43