diff --git a/Doxyfile b/Doxyfile
index bf8d6564..f7bafd78 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -41,7 +41,7 @@ PROJECT_NAME           = Crypto++
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 5.6.3
+PROJECT_NUMBER         = 5.6.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/GNUmakefile b/GNUmakefile
index ac0de7b3..3cf65169 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -776,7 +776,7 @@ endif
 %.o : %.cpp
 	$(CXX) $(CXXFLAGS) -c $<
 
-# Warn of potential configuration issues. They will go away after 5.6.3.
+# Warn of potential configuration issues. They will go away after 5.6.4.
 UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
 NO_INIT_PRIORITY := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_INIT_PRIORITY" config.h)
 COMPATIBILITY_562 := $(shell $(EGREP) -c "^[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562" config.h)
diff --git a/config.h b/config.h
index 0dd9a327..3ad015c6 100644
--- a/config.h
+++ b/config.h
@@ -63,7 +63,7 @@
 // ***************** Less Important Settings ***************
 
 // Library version
-#define CRYPTOPP_VERSION 563
+#define CRYPTOPP_VERSION 564
 
 // Define this if you want to set a prefix for TestData/ and TestVectors/
 //   Be mindful of the trailing slash since its simple concatenation.
diff --git a/config.recommend b/config.recommend
index 4e1863d7..2f304d62 100644
--- a/config.recommend
+++ b/config.recommend
@@ -63,7 +63,7 @@
 // ***************** Less Important Settings ***************
 
 // Library version
-#define CRYPTOPP_VERSION 563
+#define CRYPTOPP_VERSION 564
 
 // Define this if you want to set a prefix for TestData/ and TestVectors/
 //   Be mindful of the trailing slash since its simple concatenation.
diff --git a/cryptlib.h b/cryptlib.h
index e934718c..ca93527c 100644
--- a/cryptlib.h
+++ b/cryptlib.h
@@ -3,7 +3,7 @@
 //! \file cryptlib.h
 //! \brief Abstract base classes that provide a uniform interface to this library.
 
-/*!	\mainpage Crypto++ Library 5.6.3 API Reference
+/*!	\mainpage Crypto++ Library 5.6.4 API Reference
 <dl>
 <dt>Abstract Base Classes<dd>
 	cryptlib.h
diff --git a/cryptopp.rc b/cryptopp.rc
index 3e8235ac..bf338532 100644
--- a/cryptopp.rc
+++ b/cryptopp.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,6,3,0
- PRODUCTVERSION 5,6,3,0
+ FILEVERSION 5,6,4,0
+ PRODUCTVERSION 5,6,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,16 +43,16 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "free crypto library, more information available at www.cryptopp.com"
+            VALUE "Comments", "Free crypto library, more information available at www.cryptopp.com"
             VALUE "CompanyName", "Wei Dai"
             VALUE "FileDescription", "Crypto++® Library DLL"
-            VALUE "FileVersion", "5, 6, 3, 0"
+            VALUE "FileVersion", "5, 6, 4, 0"
             VALUE "InternalName", "cryptopp"
-            VALUE "LegalCopyright", "Copyright © 1995-2015 by Wei Dai"
+            VALUE "LegalCopyright", "Copyright© 1995-2016 by Wei Dai"
             VALUE "LegalTrademarks", "Crypto++®"
             VALUE "OriginalFilename", "cryptopp.dll"
             VALUE "ProductName", "Crypto++® Library"
-            VALUE "ProductVersion", "5, 6, 3, 0"
+            VALUE "ProductVersion", "5, 6, 4, 0"
         END
     END
     BLOCK "VarFileInfo"