diff --git a/.openshift/markers/java8 b/.openshift/markers/java8
new file mode 100644
index 00000000..e69de29b
diff --git a/.travis.yml b/.travis.yml
index a39a2226..e7969656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
 language: java
 jdk:
-  - openjdk7
-  - oraclejdk7
   - oraclejdk8
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index da98779c..70f52dbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+v 2.2.0
+  - java8 is now required
 v 2.1.0
   - dropwizard upgrade to 0.8.0
   - you have to remove the "app.contextPath" setting from your yml file, you can optionally use server.applicationContextPath instead
diff --git a/README.md b/README.md
index 64497df1..9bdf5e73 100644
--- a/README.md
+++ b/README.md
@@ -27,12 +27,12 @@ Browser extensions: [Chrome](https://github.com/Athou/commafeed-chrome) - [Firef
 CommaFeed 2.0 has been rewritten to use Dropwizard and gulp instead of using tomee and wro4j. The latest version of the 1.x branch is available [here](https://github.com/Athou/commafeed/tree/1.x).
 
 For storage, you can either use an embedded H2 database (use it only to test CommaFeed) or an external MySQL, PostgreSQL or SQLServer database.
-You also need Maven 3.x (and a Java 1.7+ JDK) installed in order to build the application.
+You also need Maven 3.x (and a Java 1.8+ JDK) installed in order to build the application.
 
 To install maven and openjdk on Ubuntu, issue the following commands
 
-    sudo apt-get install g++ build-essential openjdk-7-jdk maven
-    # Make sure java7 is the selected java version
+    sudo apt-get install g++ build-essential openjdk-8-jdk maven
+    # Make sure java8 is the selected java version
     sudo update-alternatives --config java
     sudo update-alternatives --config javac
     
diff --git a/pom.xml b/pom.xml
index d4bc18aa..72c6a51b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.1.0</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>CommaFeed</name>
 
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<dropwizard.version>0.8.0-rc1</dropwizard.version>
 		<guice.version>4.0-beta5</guice.version>
 		<querydsl.version>3.6.0</querydsl.version>