diff --git a/AUTHORS b/AUTHORS
index ff698991516..6765de25b79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,13 +11,16 @@ ambro2
 Ambrogio Oliva
 Andreas Amann
 Andreas Rudert
+Anh Nghia Tran
 Behrouz Javanmardi
 Bernd Kalbfuss
 Bernhard Tempel
+braunch.dev
 Brian Quistorff
 Brian Van Essen
 captain123
 Carlos Silla
+Christian Bartsch
 Christian Kopf
 Christopher Oezbek
 Christopher S. Lester
@@ -54,6 +57,7 @@ Jan Frederik Maas
 Jan Kubovy
 Janosch Kutscherauer
 Jason Pickering
+Jeff Kerr
 Jeffrey Kuhn
 John David
 John Relph
@@ -80,6 +84,7 @@ Marius Kleiner
 Mark Schenk
 Martin Kähmer
 Martin Stolle
+Mathias Walter
 Matthias Geiger
 Mattias Ulbrich
 mcmoody
@@ -116,6 +121,7 @@ S M Mahbub Murshed
 Saivert
 Samin Muhammad Ridwanul Karim
 Sascha Hunold
+Sascha Zeller
 Saverio Mori
 Seb Wills
 Simon Harrer
@@ -130,6 +136,7 @@ The Gitter Badger
 Thiago Toledo
 Thomas Arildsen
 Thorsten Dahlheimer
+Tobias Boceck
 Tobias Denkinger
 Tobias Diez
 tokkot
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a591c449cd..eebad96916d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 to [sourceforge bugs](https://sourceforge.net/p/jabref/bugs/) by using `bug NUM`, and
 to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by using `feature NUM`.
 
-## [Unreleased]
+## [3.1] - 2015-12-24
 
 ### Changed
 - Added new DoiResolution fetcher that tries to download full text PDF from DOI link
@@ -189,7 +189,7 @@ Since much functionality has changed during development, a release of this versi
 
 The changelog of 2.11 and versions before is maintained as [text file](https://github.com/JabRef/jabref/blob/dev_2.11/CHANGELOG) in the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
 
-[Unreleased]: https://github.com/JabRef/jabref/compare/v3.0...HEAD
+[3.1]: https://github.com/JabRef/jabref/compare/v3.0...v3.1
 [3.0]: https://github.com/JabRef/jabref/compare/v2.11.1...v3.0
 [dev_2.11]: https://github.com/JabRef/jabref/compare/v2.11.1...dev_2.11
 [2.11.1]: https://github.com/JabRef/jabref/compare/v2.11...v2.11.1
diff --git a/README.md b/README.md
index c589be74b5d..d8044622d66 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# JabRef Development Version
+# JabRef Version 3.1
 
 [![CircleCI](https://img.shields.io/circleci/project/JabRef/jabref/master.svg)](https://circleci.com/gh/JabRef/jabref)
 [![Dependency Status](https://www.versioneye.com/user/projects/557f2723386664002000009c/badge.svg?style=flat)](https://www.versioneye.com/user/projects/557f2723386664002000009c)
@@ -9,30 +9,18 @@
 [![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/pr)](http://www.issuestats.com/github/jabref/jabref)
 [![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/issue)](http://www.issuestats.com/github/jabref/jabref)
 
-This version is a development version. Features may not work as expected.
-
-The branch of this README file is `master`.
-The intention of this branch is to move JabRef forward to modern technologies such as Java8 and JavaFX.
-
-The last version with Java 6 support is `v2.11` being developed at the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
-
 Development builds are available at [builds.jabref.org](http://builds.jabref.org/master/), the [latest release is available via GitHub](https://github.com/JabRef/jabref/releases/latest).
 
 Explanation of donation possibilities and usage of donations is available at our [donations page](https://github.com/JabRef/jabref/wiki/Donations).
 
 We use [install4j], the multi-platform installer builder.
 
-### Breaking Changes in Comparison to v2.11
-
-* No plugin support
-* Transition to Java8
-
 ### Background
 
-JabRef is a graphical Java application for editing bibtex (`.bib`) databases.
+JabRef is a graphical Java application for editing Bibtex (`.bib`) databases.
 JabRef lets you organize your entries into overlapping logical groups, and with a single click limit your view to a single group or an intersection or union of several groups.
 You can customize the entry information shown in the main window, and sort by any of the standard Bibtex fields.
-JabRef can autogenerate bibtex keys for your entries.
+JabRef can autogenerate Bibtex keys for your entries.
 JabRef also lets you easily link to PDF or web sources for your reference entries.
 
 JabRef can import from and export to several formats, and you can customize export filters.
diff --git a/build.gradle b/build.gradle
index 19de9514285..5d3491b8c4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ gradle.taskGraph.whenReady { taskGraph ->
 }
 
 group = "net.sf.jabref"
-version = "3.1dev"
-project.ext.threeDotVersion = "3.0.0.1"
+version = "3.1"
+project.ext.threeDotVersion = "3.1.0.0"
 project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6')
 sourceCompatibility = 1.8
 targetCompatibility = 1.8