diff --git a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
index 0e02c41df..1af0ef406 100644
--- a/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.compat1x.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer Tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.compat1x.test
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Fragment-Host: org.openhab.core.compat1x
 Import-Package: 
  groovy.lang,
diff --git a/bundles/org.openhab.core.compat1x.test/pom.xml b/bundles/org.openhab.core.compat1x.test/pom.xml
index b6dd7a55f..61d2f5745 100644
--- a/bundles/org.openhab.core.compat1x.test/pom.xml
+++ b/bundles/org.openhab.core.compat1x.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.compat1x.test</artifactId>
diff --git a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
index 42c3ff492..991a1121e 100644
--- a/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.compat1x/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-Name: openHAB 1.x Compatibility Layer
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.compat1x
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Export-Package: 
  org.codehaus.jackson,
  org.codehaus.jackson.annotate,
diff --git a/bundles/org.openhab.core.compat1x/pom.xml b/bundles/org.openhab.core.compat1x/pom.xml
index d3a5005f8..94a46f571 100644
--- a/bundles/org.openhab.core.compat1x/pom.xml
+++ b/bundles/org.openhab.core.compat1x/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.compat1x</artifactId>
diff --git a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
index e08cdb13f..593fbcc24 100644
--- a/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core.karaf/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB Karaf Integration
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core.karaf;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Import-Package: 
  com.google.common.base,
  com.google.common.collect,
diff --git a/bundles/org.openhab.core.karaf/pom.xml b/bundles/org.openhab.core.karaf/pom.xml
index c8b7ef81f..d572e9c3d 100644
--- a/bundles/org.openhab.core.karaf/pom.xml
+++ b/bundles/org.openhab.core.karaf/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/bundles/org.openhab.core/META-INF/MANIFEST.MF b/bundles/org.openhab.core/META-INF/MANIFEST.MF
index 40744fbbc..2fe76a7d4 100644
--- a/bundles/org.openhab.core/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB Core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.core
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Export-Package: org.openhab.core
 Ignore-Package: org.openhab.core.internal.items,org.openhab.core.interna
  l,org.openhab.core.internal.events
diff --git a/bundles/org.openhab.core/pom.xml b/bundles/org.openhab.core/pom.xml
index 68a3b8d0a..41c189e3c 100644
--- a/bundles/org.openhab.core/pom.xml
+++ b/bundles/org.openhab.core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom-bundles</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core</artifactId>
diff --git a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
index cda51c8ce..3be3acda1 100644
--- a/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.jetty.certificate/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB SSL Certificate Generator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.jetty.certificate;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
  org.osgi.framework,
diff --git a/bundles/org.openhab.io.jetty.certificate/pom.xml b/bundles/org.openhab.io.jetty.certificate/pom.xml
index 4793983ff..f954bf83f 100644
--- a/bundles/org.openhab.io.jetty.certificate/pom.xml
+++ b/bundles/org.openhab.io.jetty.certificate/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.io.jetty.certificate</artifactId>
diff --git a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
index 907cbba1a..e7e607572 100644
--- a/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.rest.docs/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB REST Documentation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.rest.docs
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Import-Package: 
  com.google.gson,
  com.google.gson.annotations,
diff --git a/bundles/org.openhab.io.rest.docs/pom.xml b/bundles/org.openhab.io.rest.docs/pom.xml
index fb8bed32b..0bb14614a 100644
--- a/bundles/org.openhab.io.rest.docs/pom.xml
+++ b/bundles/org.openhab.io.rest.docs/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.io.rest.docs</artifactId>
diff --git a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
index 68c580e39..830ad3e9c 100644
--- a/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.io.sound/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB Sound Support
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.io.sound
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Fragment-Host: org.eclipse.smarthome.io.javasound
 Import-Package: 
  org.apache.commons.collections,
diff --git a/bundles/org.openhab.io.sound/pom.xml b/bundles/org.openhab.io.sound/pom.xml
index 905eab412..a72d42637 100644
--- a/bundles/org.openhab.io.sound/pom.xml
+++ b/bundles/org.openhab.io.sound/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.io.sound</artifactId>
diff --git a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
index 89251c2c2..561ebdbae 100644
--- a/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.basicui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB Basic UI Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.basicui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.basic
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.basicui/pom.xml b/bundles/org.openhab.ui.basicui/pom.xml
index 3010568f6..9748c2afe 100644
--- a/bundles/org.openhab.ui.basicui/pom.xml
+++ b/bundles/org.openhab.ui.basicui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.ui.basicui</artifactId>
diff --git a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
index 858fd0336..88fe38be4 100644
--- a/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.classicui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB Classic UI Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.classicui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.classic
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.classicui/pom.xml b/bundles/org.openhab.ui.classicui/pom.xml
index 39f1466d6..239d254ec 100644
--- a/bundles/org.openhab.ui.classicui/pom.xml
+++ b/bundles/org.openhab.ui.classicui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.ui.classicui</artifactId>
diff --git a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
index 5f2a37bfa..44d9f6113 100644
--- a/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.dashboard/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: openHAB Dashboard UI
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.dashboard
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Export-Package: org.openhab.ui.dashboard
 Import-Package: 
  javax.servlet,
diff --git a/bundles/org.openhab.ui.dashboard/pom.xml b/bundles/org.openhab.ui.dashboard/pom.xml
index 22d113856..0e5f3d9c7 100644
--- a/bundles/org.openhab.ui.dashboard/pom.xml
+++ b/bundles/org.openhab.ui.dashboard/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
 	<artifactId>pom-bundles</artifactId>
-  	<version>2.3.0-SNAPSHOT</version>
+  	<version>2.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.ui.dashboard</artifactId>
diff --git a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
index 034c6d5c2..e716902ca 100644
--- a/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.homebuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HomeBuilder User Interface
 Bundle-SymbolicName: org.openhab.ui.homebuilder
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/*.xml
 Import-Package: com.google.gson,
diff --git a/bundles/org.openhab.ui.homebuilder/pom.xml b/bundles/org.openhab.ui.homebuilder/pom.xml
index 3d98eecf7..7de463b20 100644
--- a/bundles/org.openhab.ui.homebuilder/pom.xml
+++ b/bundles/org.openhab.ui.homebuilder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openhab.core</groupId>
 		<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
index a4fba4b68..b52e48ffc 100644
--- a/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
+++ b/bundles/org.openhab.ui.paperui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Name: openHAB Paper UI Theme Fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.openhab.ui.paperui
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
 Fragment-Host: org.eclipse.smarthome.ui.paper
 Import-Package: 
  org.eclipse.jdt.annotation;resolution:=optional,
diff --git a/bundles/org.openhab.ui.paperui/pom.xml b/bundles/org.openhab.ui.paperui/pom.xml
index 576f93ec0..87a37a38d 100644
--- a/bundles/org.openhab.ui.paperui/pom.xml
+++ b/bundles/org.openhab.ui.paperui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 	    <groupId>org.openhab.core</groupId>
     	<artifactId>pom-bundles</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.openhab.ui.paperui</artifactId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 549020d7a..adedf0ea8 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/features/openhab-core/pom.xml b/features/openhab-core/pom.xml
index 5110e0db4..ba7be2323 100644
--- a/features/openhab-core/pom.xml
+++ b/features/openhab-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openhab.core</groupId>
         <artifactId>pom-features</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>openhab-core</artifactId>
diff --git a/features/p2/feature.xml b/features/p2/feature.xml
index 62ac4053e..075d7889e 100644
--- a/features/p2/feature.xml
+++ b/features/p2/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.openhab.feature.p2"
       label="openHAB Core Components"
-      version="2.3.0.qualifier"
+      version="2.4.0.qualifier"
       provider-name="openHAB.org">
 
    <description>
diff --git a/features/p2/pom.xml b/features/p2/pom.xml
index 72409b41a..cc6d5d798 100644
--- a/features/p2/pom.xml
+++ b/features/p2/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>pom-tycho</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 3fdd4d4e6..1568aa2a5 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/features/repo/category.xml b/features/repo/category.xml
index f4647b69a..56707d4b7 100644
--- a/features/repo/category.xml
+++ b/features/repo/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.openhab.feature.p2_2.3.0.qualifier.jar" id="org.openhab.feature.p2" version="2.3.0.qualifier">
+   <feature url="features/org.openhab.feature.p2_2.4.0.qualifier.jar" id="org.openhab.feature.p2" version="2.4.0.qualifier">
       <category name="org.openhab"/>
    </feature>
    <category-def name="org.openhab" label="openHAB">
diff --git a/features/repo/pom.xml b/features/repo/pom.xml
index 01b9abddf..d8c7da31b 100644
--- a/features/repo/pom.xml
+++ b/features/repo/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.openhab</groupId>
     <artifactId>pom-tycho</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../../poms/tycho/pom.xml</relativePath>
   </parent>
 
diff --git a/features/verify-karaf/pom.xml b/features/verify-karaf/pom.xml
index 8bd363b7f..1c35de07f 100644
--- a/features/verify-karaf/pom.xml
+++ b/features/verify-karaf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openhab.core</groupId>
         <artifactId>pom-features</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.openhab.features.karaf.verify</artifactId>
diff --git a/pom.xml b/pom.xml
index 97958b519..3a2e330a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.openhab</groupId>
         <artifactId>pom-tycho</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.4.0-SNAPSHOT</version>
         <relativePath>poms/tycho/pom.xml</relativePath>
     </parent>
 
     <groupId>org.openhab.core</groupId>
     <artifactId>pom</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>openHAB</name>
diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml
index 9f19b4a29..608ade61d 100644
--- a/poms/tycho/pom.xml
+++ b/poms/tycho/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>pom-tycho</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>openHAB - Tycho settings</name>