diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aa57d574..2e6f5c835 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.05")
-set(DFHACK_RELEASE "r6")
+set(DFHACK_RELEASE "r7")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 52e906486..72fb5906c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,13 +33,25 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+# 0.47.05-r7
+
 ## New Plugins
 - `autonestbox`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autonestbox start`` to ``enable autonestbox``.
 - `autobutcher`: split off from `zone` into its own plugin. Note that to enable, the command has changed from ``autobutcher start`` to ``enable autobutcher``.
 - `overlay`: display a "DFHack" button in the lower left corner that you can click to start the new GUI command launcher. The `dwarfmonitor` weather display had to be moved to make room for the button. If you are seeing the weather indicator rendered over the overlay button, please remove the ``dfhack-config/dwarfmonitor.json`` file to fix the weather indicator display offset.
 
-## New Tweaks
-
 ## New Internal Commands
 - `tags`: new built-in command to list the tool category tags and their definitions. tags associated with each tool are visible in the tool help and in the output of `ls`.
 
diff --git a/library/xml b/library/xml
index f5fab13fb..f5019a5c6 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f5fab13fb652dd953e9d59e8deca032b26131208
+Subproject commit f5019a5c6f19ef05a28bd974c3e8668b78e6e2a4
diff --git a/scripts b/scripts
index 19c0d1d8b..04836f16f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 19c0d1d8b131446c27513eb85bd27d48e8ea214e
+Subproject commit 04836f16f9705bfbb1438fc0870b3e41b6539f75