diff --git a/dist/bin/hfsexplorer.exe b/dist/bin/hfsexplorer.exe
index 7baf914c..eb9f7a5a 100644
Binary files a/dist/bin/hfsexplorer.exe and b/dist/bin/hfsexplorer.exe differ
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 6b27963b..1c8e8343 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,6 +2,20 @@ HFSExplorer Changelog
 ---------------------
 
 
+2021.10.9
+---------
+- Add support for selecting the character encoding for decoding HFS filenames.
+
+- Add support for more APM partition layouts, including ones with unusual
+  inconsistencies.
+
+- Add support for opening embedded disk images directly in HFSExplorer instead
+  of having to extract them first.
+
+- Fix overflow in calculations when opening HFS-wrapped HFS+ volumes causing
+  errors when extracting files and potentially when opening volumes.
+
+
 2021.2.22
 ---------
 - Add support for ARM-native JDKs on Windows (adding ARM versions of llio dll).
diff --git a/doc/hfsexplorer.nsi b/doc/hfsexplorer.nsi
index 475ca40b..287a304a 100644
--- a/doc/hfsexplorer.nsi
+++ b/doc/hfsexplorer.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "HFSExplorer"
-!define PRODUCT_VERSION "2021.2.22"
+!define PRODUCT_VERSION "2021.10.9"
 !define PRODUCT_PUBLISHER "Catacombae Software"
 !define PRODUCT_WEB_SITE "https://www.catacombae.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
diff --git a/doc/version.sdic.txt b/doc/version.sdic.txt
index b17754cf..dbf7c303 100644
--- a/doc/version.sdic.txt
+++ b/doc/version.sdic.txt
@@ -1,9 +1,9 @@
 !SimpleDictionary: 1.0
 AppName: HFSExplorer
-Version: 2021.2.22
-Build: 2021022200
-Date: 2021-02-22
-Installer: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.2.22-setup.exe?use_mirror=
-Binary: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.2.22-bin.zip?use_mirror=
-Source: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.2.22-src.zip?use_mirror=
+Version: 2021.10.9
+Build: 2021100900
+Date: 2021-10-09
+Installer: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.10.9-setup.exe?use_mirror=
+Binary: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.10.9-bin.zip?use_mirror=
+Source: http://downloads.sourceforge.net/catacombae/hfsexplorer-2021.10.9-src.zip?use_mirror=
 Changelog: http://www.catacombae.org/hfsexplorer/changelog.txt
diff --git a/src/java/org/catacombae/hfsexplorer/BuildNumber.java b/src/java/org/catacombae/hfsexplorer/BuildNumber.java
index 46fe62f3..719de94e 100644
--- a/src/java/org/catacombae/hfsexplorer/BuildNumber.java
+++ b/src/java/org/catacombae/hfsexplorer/BuildNumber.java
@@ -22,6 +22,6 @@
  */
 public class BuildNumber {
     //[BuildEnumerator:Opening] WARNING: The following lines are managed by an external program. Do NOT change.
-    public static final long BUILD_NUMBER = 2021022200L;
+    public static final long BUILD_NUMBER = 2021100900L;
     //[BuildEnumerator:Closing] The lines managed by an external program end here.
 }
diff --git a/src/java/org/catacombae/hfsexplorer/HFSExplorer.java b/src/java/org/catacombae/hfsexplorer/HFSExplorer.java
index 2db31d70..235b6a3c 100644
--- a/src/java/org/catacombae/hfsexplorer/HFSExplorer.java
+++ b/src/java/org/catacombae/hfsexplorer/HFSExplorer.java
@@ -58,7 +58,7 @@
  */
 @SuppressWarnings("deprecation") // TODO: Fix HFSExplorer so it doesn't use deprecated methods...
 public class HFSExplorer {
-    public static final String VERSION = "2021.2.22";
+    public static final String VERSION = "2021.10.9";
     public static final String COPYRIGHT =
             "Copyright \u00A9 Erik Larsson 2006-2021";
     public static final String[] NOTICES = {
diff --git a/src/win32/launcher/launcher.rc b/src/win32/launcher/launcher.rc
index d89b0814..d57d9b1c 100644
--- a/src/win32/launcher/launcher.rc
+++ b/src/win32/launcher/launcher.rc
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 //
 
 1 VERSIONINFO
- FILEVERSION 2021,2,22,0
- PRODUCTVERSION 2021,2,22,0
+ FILEVERSION 2021,10,9,0
+ PRODUCTVERSION 2021,10,9,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -44,12 +44,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Catacombae Software"
             VALUE "FileDescription", "HFSExplorer"
-            VALUE "FileVersion", "2021, 2, 22, 0"
+            VALUE "FileVersion", "2021, 10, 9, 0"
             VALUE "InternalName", "HFSExplorer"
             VALUE "LegalCopyright", "Copyright (C) 2006-2021 Erik Larsson"
             VALUE "OriginalFilename", "hfsexplorer.exe"
             VALUE "ProductName", "HFSExplorer: A tool for accessing HFS/HFS+/HFSX hard drives and disk images."
-            VALUE "ProductVersion", "2021, 2, 22, 0"
+            VALUE "ProductVersion", "2021, 10, 9, 0"
         END
     END
     BLOCK "VarFileInfo"