diff --git a/armoryengine/ArmoryUtils.py b/armoryengine/ArmoryUtils.py
index fcc86e3d8..bdce51fc5 100644
--- a/armoryengine/ArmoryUtils.py
+++ b/armoryengine/ArmoryUtils.py
@@ -68,7 +68,7 @@
 LEVELDB_HEADERS = 'leveldb_headers'
 
 # Version Numbers
-BTCARMORY_VERSION    = (0, 96,  4, 0)  # (Major, Minor, Bugfix, AutoIncrement)
+BTCARMORY_VERSION    = (0, 96,  4, 99)  # (Major, Minor, Bugfix, AutoIncrement)
 PYBTCWALLET_VERSION  = (1, 35,  0, 0)  # (Major, Minor, Bugfix, AutoIncrement)
 
 # ARMORY_DONATION_ADDR = '1ArmoryXcfq7TnCSuZa9fQjRYwJ4bkRKfv'
diff --git a/changelog.txt b/changelog.txt
index 3133655f3..40adc20aa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,30 @@
+v0.96.5
+== Added ==
+   - You can now set the database path from the Settings menu.
+   - You can now spend to bech32 addresses.
+   - Added support for satoshi-port CLI argument in ArmoryDB.
+
+== Fixes ==
+   - Improved bitcoind path detection.
+   - Properly carry thread-count and ram-usage command line arguments from client to automated db process.
+   - Custom paths set in the GUI will now properly overrule custom paths from armoryqt.conf.
+   - Fixed spending from lockboxes.
+   - Fixed deleting lockboxes.
+   - Fixed Simulfund promisory note creation and signing.
+   - Fixed preview dialog for unconfirmed transactions.
+   - Fixed previewing unsigned transactions in offline mode.
+   - Fixed SecurePrint decryption on Windows.
+
+   - Recent updates to the MSVC compiler resulted in invalid decryption of AES-CBC packets. This issue only
+     affects the decryption of SecurePrint encrypted backups. Encryption still operates as expected, no 
+     SecurePrint backups created with the incriminated builds are faulty. Wallets are not concerned, as they
+     use AES-CFB.
+     
+     The solution was to turn off all optimizations in MSVC when buidling CryptoPP. This may impact DB boostrapping
+     performance.
+
+     This issue affects all Windows builds of 0.96.4.
+
 v0.96.4, released March 30th 2018
 == Added ==
    - Updated fee estimate query from node to improve estimateSmartFee call introduced in Bitcoin Core 0.15.
diff --git a/configure.ac b/configure.ac
index 7e1a59c60..5246eadff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([BitcoinArmory], [0.96.4], [moothecowlord@gmail.com])
+AC_INIT([BitcoinArmory], [0.96.4.99], [moothecowlord@gmail.com])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects foreign -Wall -Werror])
 
diff --git a/cppForSwig/BitcoinP2P.cpp b/cppForSwig/BitcoinP2P.cpp
index bd37c9d8f..bcb31c27f 100644
--- a/cppForSwig/BitcoinP2P.cpp
+++ b/cppForSwig/BitcoinP2P.cpp
@@ -936,7 +936,7 @@ void BitcoinP2P::connectLoop(void)
          version.setVersionHeaderIPv4(70012, services, timestamp,
             node_addr_, clientsocketaddr);
 
-         version.userAgent_ = "Armory:0.96.4";
+         version.userAgent_ = "Armory:0.96.4.99";
          version.startHeight_ = -1;
 
          sendMessage(move(version));