diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f8b42521..dc9611eb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r3")
+set(DFHACK_RELEASE "r4")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/library/xml b/library/xml
index 403722a6c..e4ab999d1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 403722a6cbdcb65256359ceab03b203d65489c3e
+Subproject commit e4ab999d1ddb79cadd62f11c5d2781387e8ae697
diff --git a/scripts b/scripts
index e2fe6b315..a7e5655fb 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e2fe6b3158af265429e47c714ae3b6f24e145ef1
+Subproject commit a7e5655fb828598be7ea3947604aba499bf84f28