diff --git a/dist/bin/hfsexplorer.exe b/dist/bin/hfsexplorer.exe
index 0d8954a1..bbfba4a4 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 722722e3..3427565c 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,6 +2,24 @@ HFSExplorer Changelog
 ---------------------
 
 
+0.23.1
+------
+- Bugfix: Fix support for encrypted images with the version 2 header and
+  multiple key entries.
+
+- Bugfix: Help content could not be located due to a recent location change.
+
+- Enhancement: Use the same custom icon for all HFSExplorer windows, making them
+  easier to find.
+
+- Enhancement: Attempt to force the GTK+ Look & Feel if the default one provided
+  by the system is Metal or Motif. This makes HFSExplorer more usable in
+  superuser mode on many Linux distributions.
+
+- Many other small fixes. See the git log for more info:
+  https://github.com/unsound/hfsexplorer/releases/tag/hfsexplorer-0.23.1
+
+
 0.23
 ----
 - Feature: Support for files compressed with HFS+ compression methods 3 and 4
diff --git a/doc/hfsexplorer.nsi b/doc/hfsexplorer.nsi
index 5afb1183..31b767d3 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 "0.23"
+!define PRODUCT_VERSION "0.23.1"
 !define PRODUCT_PUBLISHER "Catacombae Software"
 !define PRODUCT_WEB_SITE "http://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 c363d0e3..767259d7 100644
--- a/doc/version.sdic.txt
+++ b/doc/version.sdic.txt
@@ -1,9 +1,9 @@
 !SimpleDictionary: 1.0
 AppName: HFSExplorer
-Version: 0.23
-Build: 230000
-Date: 2015-01-09
-Installer: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23-setup.exe?use_mirror=
-Binary: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23-bin.zip?use_mirror=
-Source: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23-src.zip?use_mirror=
+Version: 0.23.1
+Build: 230100
+Date: 2015-10-12
+Installer: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23.1-setup.exe?use_mirror=
+Binary: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23.1-bin.zip?use_mirror=
+Source: http://downloads.sourceforge.net/catacombae/hfsexplorer-0.23.1-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 27e94f40..33e9db9f 100644
--- a/src/java/org/catacombae/hfsexplorer/BuildNumber.java
+++ b/src/java/org/catacombae/hfsexplorer/BuildNumber.java
@@ -19,6 +19,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 = 230000L;
+    public static final long BUILD_NUMBER = 230100L;
     //[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 86533674..3998d446 100644
--- a/src/java/org/catacombae/hfsexplorer/HFSExplorer.java
+++ b/src/java/org/catacombae/hfsexplorer/HFSExplorer.java
@@ -55,7 +55,7 @@
 
 @SuppressWarnings("deprecation") // TODO: Fix HFSExplorer so it doesn't use deprecated methods...
 public class HFSExplorer {
-    public static final String VERSION = "0.23";
+    public static final String VERSION = "0.23.1";
     public static final String COPYRIGHT =
             "Copyright \u00A9 Erik Larsson 2006-2015";
     public static final String[] NOTICES = {
diff --git a/src/win32/launcher/launcher.rc b/src/win32/launcher/launcher.rc
index d58c2ddc..e9600956 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 0,23,0,0
- PRODUCTVERSION 0,23,0,0
+ FILEVERSION 0,23,1,0
+ PRODUCTVERSION 0,23,1,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -44,12 +44,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Catacombae Software"
             VALUE "FileDescription", "HFSExplorer"
-            VALUE "FileVersion", "0, 23, 0, 0"
+            VALUE "FileVersion", "0, 23, 1, 0"
             VALUE "InternalName", "HFSExplorer"
             VALUE "LegalCopyright", "Copyright (C) 2006-2015 Erik Larsson"
             VALUE "OriginalFilename", "hfsexplorer.exe"
             VALUE "ProductName", "HFSExplorer: A tool for accessing HFS/HFS+/HFSX hard drives and disk images."
-            VALUE "ProductVersion", "0, 23, 0, 0"
+            VALUE "ProductVersion", "0, 23, 1, 0"
         END
     END
     BLOCK "VarFileInfo"