diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad61d8010..4f8b42521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r2")
+set(DFHACK_RELEASE "r3")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 143e793cf..faec636dd 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-r3
+
 ## New Plugins
 - `xlsxreader`: provides an API for Lua scripts to read Excel spreadsheets
 
@@ -41,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `getplants`: fixed a crash that could occur on some maps
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
+- `stockpiles`: fixed an error when saving furniture stockpiles
 
 ## Misc Improvements
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
@@ -51,6 +54,12 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `zone`: added an ``enumnick`` subcommand to assign enumerated nicknames (e.g "Hen 1", "Hen 2"...)
 - `zone`: added slaughter indication to ``uinfo`` output
 
+## Documentation
+- Fixed syntax highlighting of most code blocks to use the appropriate language (or no language) instead of Python
+
+## API
+- Added ``DFHack::to_search_normalized()`` (Lua: ``dfhack.toSearchNormalized()``) to convert non-ASCII alphabetic characters to their ASCII equivalents
+
 # 0.47.04-r2
 
 ## New Tweaks
diff --git a/library/xml b/library/xml
index 85b8f413f..00549aca0 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 85b8f413f6f0561817c16bc0edca99fec6f1e774
+Subproject commit 00549aca0640ca121c20734df667f79b247c93b4
diff --git a/scripts b/scripts
index a6d5df4e7..0b2748554 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a6d5df4e73f06b4f8a829baeca97f0d63830b65b
+Subproject commit 0b274855424e5d0850d2cfc8b10e1cdcc47c6877