diff --git a/CHANGELOG b/CHANGELOG
index 9eafaa6d8..20545c443 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+2.3.4 (2018-08-21)
+=========================
+
+- Show all URL schemes in entry view [#1768]
+- Disable merge when database is locked [#1975]
+- Fix intermittent crashes with favorite icon downloads [#1980]
+- Provide potential crash warning to Qt 5.5.x users [#2211]
+- Disable apply button when creating new entry/group to prevent data loss [#2204]
+- Allow for 12 hour timeout to lock idle database [#2173]
+- Multiple SSH Agent fixes [#1981, #2117]
+- Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]
+- Fix browser proxy application not closing properly [#2142]
+- Add real names and Patreon supporters to about dialog [#2214]
+- Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]
+- Enhancements to release-tool to appsign intermediate build products [#2101]
+
+
 2.3.3 (2018-05-09)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2ad273d7..70f14795c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_PATCH "4")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")
diff --git a/INSTALL.md b/INSTALL.md
index 86048b501..a581d1ac7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -38,6 +38,7 @@ Prepare the Building Environment
 
 Build Steps
 ===========
+We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
 **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
@@ -68,6 +69,9 @@ cd build
 cmake -DWITH_TESTS=OFF ...and other options - see below...
 make
 ```
+
+If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information.
+
 These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
 (Note the cmake notes/options below.)
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 2f1747949..554bcdefa 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,24 @@
     </screenshots>
 
     <releases>
+        <release version="2.3.4" date="2018-08-21">
+            <description>
+                <ul>
+                    <li>Show all URL schemes in entry view [#1768]</li>
+                    <li>Disable merge when database is locked [#1975]</li>
+                    <li>Fix intermittent crashes with favorite icon downloads [#1980]</li>
+                    <li>Provide potential crash warning to Qt 5.5.x users [#2211]</li>
+                    <li>Disable apply button when creating new entry/group to prevent data loss [#2204]</li>
+                    <li>Allow for 12 hour timeout to lock idle database [#2173]</li>
+                    <li>Multiple SSH Agent fixes [#1981, #2117]</li>
+                    <li>Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]</li>
+                    <li>Fix browser proxy application not closing properly [#2142]</li>
+                    <li>Add real names and Patreon supporters to about dialog [#2214]</li>
+                    <li>Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]</li>
+                    <li>Enhancements to release-tool to appsign intermediate build products [#2101]</li>
+                </ul>
+            </description>
+        </release>
         <release version="2.3.3" date="2018-05-09">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 83f003aea..612fa2e64 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.3
+version: 2.3.4
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index b450268c3..f6cc2e4bb 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -436,8 +436,8 @@ MainWindow::MainWindow()
                                           MessageWidget::Warning, -1);
 #elif (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) && QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
     if (!config()->get("QtErrorMessageShown", false).toBool()) {
-        m_ui->globalMessageWidget->showMessage(tr("WARNING: You are using a version of Qt that causes KeePassXC to crash!\n"
-                                                  "We recommend you use the AppImage version available on our downloads page."),
+        m_ui->globalMessageWidget->showMessage(tr("WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!\n"
+                                                  "We recommend you use the AppImage available on our downloads page."),
                                               MessageWidget::Warning, -1);
         config()->set("QtErrorMessageShown", true);
     }