diff --git a/CHANGELOG b/CHANGELOG
index 0f9a73ff4..7b52f594e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,14 @@
 This is the changelog file for the POCO C++ Libraries.
 
+Release 1.7.8p4 (2017-08-11)
+============================
+
+- fixed GH #1813: xmlparse.cpp doesn't compile in WinCE (poco 1.7.8p3)
+- fixed GH #1834: Visual Studio 2008 cannot find stdint.h
+- fixed GH #1842: Upgrade bundled expat to 2.2.3
+- fixed GH #1843: Use random salt for Poco::XML::NamePool
+
+
 Release 1.7.8p3 (2017-06-22)
 ============================
 
diff --git a/DLLVersion.rc b/DLLVersion.rc
index 52a61638b..2aeba2c2e 100644
--- a/DLLVersion.rc
+++ b/DLLVersion.rc
@@ -4,8 +4,8 @@
 
 #include "winres.h"
 
-#define POCO_VERSION 1,7,8,3
-#define POCO_VERSION_STR "1.7.8p3"
+#define POCO_VERSION 1,7,8,4
+#define POCO_VERSION_STR "1.7.8p4"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION POCO_VERSION
diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h
index 0aaf2720a..6e36b0cfa 100644
--- a/Foundation/include/Poco/Version.h
+++ b/Foundation/include/Poco/Version.h
@@ -37,7 +37,7 @@
 //      Ax: alpha releases
 //      Bx: beta releases
 //
-#define POCO_VERSION 0x01070803
+#define POCO_VERSION 0x01070804
 
 
 #endif // Foundation_Version_INCLUDED
diff --git a/VERSION b/VERSION
index b5cd65cfa..6c4f46345 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.8p3
+1.7.8p4
diff --git a/XML/src/xmlparse.cpp b/XML/src/xmlparse.cpp
index 72f563d74..967659394 100644
--- a/XML/src/xmlparse.cpp
+++ b/XML/src/xmlparse.cpp
@@ -917,6 +917,7 @@ gather_time_entropy(void)
 
 static unsigned long
 ENTROPY_DEBUG(const char * label, unsigned long entropy) {
+#ifdef ENABLE_EXPAT_ENTROPY_DEBUG
   const char * const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
   if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
     fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n",
@@ -924,6 +925,7 @@ ENTROPY_DEBUG(const char * label, unsigned long entropy) {
         (int)sizeof(entropy) * 2, entropy,
         (unsigned long)sizeof(entropy));
   }
+#endif
   return entropy;
 }
 
diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page
index 97f8d5abb..544d2a6cf 100644
--- a/doc/99100-ReleaseNotes.page
+++ b/doc/99100-ReleaseNotes.page
@@ -1,6 +1,14 @@
 POCO C++ Libraries Release Notes
 AAAIntroduction
 
+!!!Release 1.7.8p4
+
+  - fixed GH #1813: xmlparse.cpp doesn't compile in WinCE (poco 1.7.8p3)
+  - fixed GH #1834: Visual Studio 2008 cannot find stdint.h
+  - fixed GH #1842: Upgrade bundled expat to 2.2.3
+  - fixed GH #1843: Use random salt for Poco::XML::NamePool
+
+
 !!!Release 1.7.8p3
 
   - fixed GH #1760: Upgrade bundled expat to 2.2.1 which fixes some vulnerabilities: