diff --git a/CHANGELOG b/CHANGELOG
index 20545c443..4c29e968e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+2.4.0-preview (TBD)
+=========================
+
+This is a pre-release build, view merged PR's at
+https://github.com/keepassxreboot/keepassxc/pulls?q=is%3Apr+milestone%3Av2.4.0+is%3Aclosed
+
 2.3.4 (2018-08-21)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cac3cc9d..7be9e3013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,8 +61,8 @@ endif()
 set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "4")
+set(KEEPASSXC_VERSION_MINOR "4")
+set(KEEPASSXC_VERSION_PATCH "0")
 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/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index 554bcdefa..cf9d499bf 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,13 @@
     </screenshots>
 
     <releases>
+        <release version="2.4.0-preview" date="TBD">
+            <description>
+                <p>
+                This is a pre-release build, <a href="https://github.com/keepassxreboot/keepassxc/pulls?q=is%3Apr+milestone%3Av2.4.0+is%3Aclosed">click to view merged PR's</a>                
+                </p>
+            </description>
+        </release>
         <release version="2.3.4" date="2018-08-21">
             <description>
                 <ul>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 25baf676a..d67c366d4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.3.4
+version: 2.4.0
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
@@ -29,7 +29,7 @@ parts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DKEEPASSXC_DIST_TYPE=Snap
-      - -DKEEPASSXC_BUILD_TYPE=Release
+      - -DKEEPASSXC_BUILD_TYPE=PreRelease
       - -DWITH_TESTS=OFF
       - -DWITH_XC_ALL=ON
     build-packages: