diff --git a/Makefile b/Makefile
index 40526834..b2c59502 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ BEAT_DESCRIPTION=Execute commands in a regular interval and the standard output
 BEAT_DIR=github.com/christiangalsterer/execbeat
 SYSTEM_TESTS=false
 TEST_ENVIRONMENT=false
+SNAPSHOT=no
 ES_BEATS?=./vendor/github.com/elastic/beats
 # GOPACKAGES=$(shell glide novendor)
 GOPACKAGES=$(shell go list ${BEAT_DIR}/... | grep -v /vendor/)
diff --git a/README.md b/README.md
index 299bb7bb..9ac8892e 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,11 @@ This will fetch and create all images required for the build process. The comple
 
 # Releases
 
+3.1.1 (WiP) [Download](https://github.com/christiangalsterer/execbeat/releases/tag/3.1.1)
+
+Bugfix release containing the following changes:
+* [Set correct version in package names and package metadata](https://github.com/christiangalsterer/execbeat/issues/10)
+
 3.1.0 (2017-02-23) [Download](https://github.com/christiangalsterer/execbeat/releases/tag/3.1.0)
 
 Feature and bugfix release containing the following changes:
diff --git a/main.go b/main.go
index 5a0cb74c..5dda8809 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 )
 
-var version = "3.1.0"
+var version = "3.1.1-SNAPSHOT"
 var name = "execbeat"
 
 func main() {
diff --git a/version.go b/version.go
new file mode 100644
index 00000000..fa5eb03f
--- /dev/null
+++ b/version.go
@@ -0,0 +1,3 @@
+package main
+
+const appVersion = "3.1.1"
diff --git a/version.yml b/version.yml
new file mode 100644
index 00000000..85e771f0
--- /dev/null
+++ b/version.yml
@@ -0,0 +1 @@
+version: "3.1.1"