diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1560c630..3ea16ce29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,8 +192,8 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "50.08")
-set(DFHACK_RELEASE "r2rc1")
-set(DFHACK_PRERELEASE TRUE)
+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 4708711c1..bd1b97e6e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,14 +34,32 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## New Plugins
-- `add-spatter`: reinstated: allow mods to add poisons and magical effects to weapons
-- `changeitem`: reinstated: change item material, quality, and subtype
-- `createitem`: reinstated: create arbitrary items, from the command line
-- `deramp`: reinstated: removes all ramps designated for removal from the map
-- `flows`: reinstated: counts map blocks with flowing liquids
-- `lair`: reinstated: mark the map as a monster lair (this avoids item scatter when the fortress is abandoned)
-- `luasocket`: reinstated: provides a Lua API for accessing network sockets
-- `work-now`: reinstated, renamed from ``workNow``: reduce the time that dwarves are left without a task after completing a job
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Internals
+
+## Lua
+
+## Removed
+
+# 50.08-r2
+
+## New Plugins
+- `add-spatter`: (reinstated) allow mods to add poisons and magical effects to weapons
+- `changeitem`: (reinstated) change item material, quality, and subtype
+- `createitem`: (reinstated) create arbitrary items from the command line
+- `deramp`: (reinstated) removes all ramps designated for removal from the map
+- `flows`: (reinstated) counts map blocks with flowing liquids
+- `lair`: (reinstated) mark the map as a monster lair (this avoids item scatter when the fortress is abandoned)
+- `luasocket`: (reinstated) provides a Lua API for accessing network sockets
+- `work-now`: (reinstated, renamed from ``workNow``) prevent dwarves from wandering aimlessly with "No job" after completing a task
 
 ## Fixes
 - DFHack screen backgrounds now use appropriate tiles in DF Classic
@@ -51,24 +69,19 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Misc Improvements
 - `autodump`: no longer checks for a keyboard cursor before executing, so ``autodump destroy`` (which doesn't require a cursor) can still function
-- Settings: recover gracefully when settings files become corrupted (e.g. by CTD)
-- `orders`: update orders in orders library for prepared meals, bins, archer uniforms, and weapons
-- Terminal console no longer appears in front of the game window on startup
+- Settings: recover gracefully when settings files become corrupted (e.g. by DF CTD)
+- `orders`: update orders in library for prepared meals, bins, archer uniforms, and weapons
 - `gui/control-panel`: new preference for whether filters in lists search for substrings in the middle of words (e.g. if set to true, then "ee" will match "steel")
 - `gui/design`: Improved performance for drawing shapes
 - Dreamfort: improve traffic patterns throughout the fortress
 - `gui/blueprint`: recording of stockpile layouts and categories is now supported. note that detailed stockpile configurations will *not* be saved (yet)
-- Core: For debugging purposes, you can now pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session.
-- `overlay`: added links to the quickstart guide and the control panel on the DF title screen
+- Core: new commandline flag/environment var: pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session.
+- `overlay`: add links to the quickstart guide and the control panel on the DF title screen
 - Window behavior: non-resizable windows now allow dragging by their frame edges by default
-- `gui/autodump`: fort-mode keybinding: Ctrl-H
+- `gui/autodump`: fort-mode keybinding: Ctrl-H (when ``armok`` tools are enabled in `gui/control-panel`)
 - Window behavior: if you have multiple DFHack tool windows open, scrolling the mouse wheel while over an unfocused window will focus it and raise it to the top
 - `stockpiles`: allow filtering creatures by tameability
 
-## Documentation
-
-## API
-
 ## Internals
 - ``dfhack.internal``: added memory analysis functions: ``msizeAddress``, ``getHeapState``, ``heapTakeSnapshot``, ``isAddressInHeap``, ``isAddressActiveInHeap``, ``isAddressUsedAfterFreeInHeap``, ``getAddressSizeInHeap``, and ``getRootAddressOfHeapObject``
 
diff --git a/library/xml b/library/xml
index 17e77412c..51fe3ca11 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 17e77412c040dab658a39a34eb0e21cb014c3824
+Subproject commit 51fe3ca11f9587bc50ed09b768022cd9688250d8
diff --git a/scripts b/scripts
index 6430e8ed0..315c7afc2 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6430e8ed0facbe152e98f5ff1f274febfd6b5772
+Subproject commit 315c7afc20651ac0fe1700d720f71796190f198e