diff --git a/.travis.yml b/.travis.yml
index c2f695e..632ff89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: java
 jdk:
   - oraclejdk7
diff --git a/README.md b/README.md
index 761a128..699eb45 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,37 @@
-# Graylog MQTT Input Plugin
-[![Build Status](https://travis-ci.org/Graylog2/graylog2-input-mqtt.svg?branch=v1.1.0)](https://travis-ci.org/Graylog2/graylog2-input-mqtt)
+MQTT Plugin for Graylog
+=======================
+
+[![Build Status](https://travis-ci.org/Graylog2/graylog-plugin-mqtt.svg)](https://travis-ci.org/Graylog2/graylog-plugin-mqtt)
 
 This is an input plugin that allows you to subscribe to an [MQTT](http://mqtt.org) broker and index all published messages.
-It _requires_ a recent Graylog server (1.0.0 or higher)
 
-Getting started for users
--------------------------
+**Required Graylog version:** 1.0 and later
+
+## Installation
+
+[Download the plugin](https://github.com/Graylog2/graylog-plugin-mqtt/releases)
+and place the `.jar` file in your Graylog plugin directory. The plugin directory
+is the `plugins/` folder relative from your `graylog-server` directory by default
+and can be configured in your `graylog.conf` file.
+
+Restart `graylog-server` and you are done.
+
+## Build
+
+This project is using Maven and requires Java 7 or higher.
+
+You can build a plugin (JAR) with `mvn package`.
+
+DEB and RPM packages can be build with `mvn jdeb:jdeb` and `mvn rpm:rpm` respectively.
+
+## Plugin Release
+
+We are using the maven release plugin:
+
+```
+$ mvn release:prepare
+[...]
+$ mvn release:perform
+```
 
-* Clone this repository
-* run `mvn package` to build a jar file.
-* Copy generated jar file in target directory to your Graylog server plugin directory
-* Restart Graylog server
-* Create a new MQTT Input in the Graylog web interface
+This sets the version numbers, creates a tag and pushes to GitHub. TravisCI will build the release artifacts and upload to GitHub automatically.
diff --git a/pom.xml b/pom.xml
index 4f1ab5b..20efdf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.graylog</groupId>
-    <artifactId>graylog-input-mqtt</artifactId>
-    <version>1.1.0</version>
+    <groupId>org.graylog.plugins</groupId>
+    <artifactId>graylog-plugin-mqtt</artifactId>
+    <version>1.1.1-SNAPSHOT</version>
 
-    <name>graylog-input-mqtt</name>
+    <name>${project.artifactId}</name>
     <description>Graylog MQTT Input plugin</description>
     <url>https://www.graylog.org</url>
 
@@ -17,6 +17,13 @@
         <url>https://www.graylog.com</url>
     </organization>
 
+    <scm>
+        <connection>scm:git:git@github.com:Graylog2/graylog-plugin-mqtt.git</connection>
+        <developerConnection>scm:git:git@github.com:Graylog2/graylog-plugin-mqtt.git</developerConnection>
+        <url>https://github.com/Graylog2/graylog-plugin-mqtt</url>
+        <tag>HEAD</tag>
+    </scm>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -113,6 +120,19 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <mavenExecutorId>forked-path</mavenExecutorId>
+                    <tagNameFormat>@{project.version}</tagNameFormat>
+                    <preparationGoals>clean test</preparationGoals>
+                    <goals>package</goals>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.vafer</groupId>
                 <artifactId>jdeb</artifactId>
diff --git a/src/main/java/org/graylog2/inputs/mqtt/MQTTInputMetadata.java b/src/main/java/org/graylog2/inputs/mqtt/MQTTInputMetadata.java
index 20aeee5..befee68 100644
--- a/src/main/java/org/graylog2/inputs/mqtt/MQTTInputMetadata.java
+++ b/src/main/java/org/graylog2/inputs/mqtt/MQTTInputMetadata.java
@@ -31,7 +31,7 @@ public URI getURL() {
 
     @Override
     public Version getVersion() {
-        return new Version(1, 0, 2);
+        return new Version(1, 1, 1);
     }
 
     @Override