diff --git a/.travis.yml b/.travis.yml
index ae41cfc86e..722dda345b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ deploy:
     api_key:
         secure: fkelxNMcGoNY4MT30dEiEUE53cMkhtmr44Y7iSEkOGmfeG9ReUqVIk1nd7027iehzdhhcov57XwHg49KA+AWpQGvEbLkRNRazOxSGFL9o/P/Rzft/tvKP0sxcRF5RUVo0b5J5wlsIKSlbjDqGu9CM+G4eyK0D2jo/XPzsv9akKQ=
     skip_cleanup: true
-    file: poedit-3.0.1.tar.gz
+    file: poedit-3.1.tar.gz
     on:
         repo: vslavik/poedit
         tags: true
diff --git a/NEWS b/NEWS
index e954722ba7..e5c617a8ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
 
+Version 3.1
+-----------
+
+- Added Go / Previously Edited menu command.
+- Improved source code viewer performance.
+- XLIFF: added support for resname/name attributes.
+- Fixed ID column sizing on some platforms.
+- Fixed issues with certain rare escape sequences.
+
+
 Version 3.0.1
 -------------
 
@@ -836,7 +846,7 @@ Version 1.3.1
 - fixed crash with catalogs that have plural forms but no Plural-Forms header
 - fixed parsing of the line following last msgstr[i] entry (bug #1025211)
 - fixed controls layout when compiled against wxWidgets 2.4
- 
+
 
 Version 1.3.0
 -------------
@@ -980,7 +990,7 @@ Version 1.1.10
 
 - fix to "fixes to catalog charset handling" from 1.1.9
 - Unix: configure now checks for db4 in addition to db and db3
-- Windows: fixed launching Poedit via associations when long filenames 
+- Windows: fixed launching Poedit via associations when long filenames
   were involved
 - added more translations:
      Polish (Arkadiusz Lipiec)
@@ -995,7 +1005,7 @@ Version 1.1.9
 
 - fixes to catalog charset handling
 - Linux: added Mandrake RPM packages
-- added translations to more languages: 
+- added translations to more languages:
      Estonian (Joosep-Georg Jarvemaa)
      Dutch (Patrick Hubers)
      German (Bernd Böckmann)
@@ -1078,10 +1088,10 @@ Version 1.1.2
 -------------
 
 - fixed incorrect update of TM database path setting from preferences dialog
-- fixed assertion failures with empty catalog files when right-clicking 
+- fixed assertion failures with empty catalog files when right-clicking
   the list control
 - changed default TM DB path to something more sane under Windows
-- Windows: fixed directories traversal during TM update under Windows 
+- Windows: fixed directories traversal during TM update under Windows
 
 
 Version 1.1.1
diff --git a/Poedit.xcodeproj/project.pbxproj b/Poedit.xcodeproj/project.pbxproj
index 8042623c0a..bfbfd1d75b 100644
--- a/Poedit.xcodeproj/project.pbxproj
+++ b/Poedit.xcodeproj/project.pbxproj
@@ -1794,7 +1794,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				POEDIT_FEATURES = "";
-				POEDIT_VERSION = 3.0.1;
+				POEDIT_VERSION = 3.1;
 				SDKROOT = macosx;
 				WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1";
 			};
@@ -1866,7 +1866,7 @@
 				LLVM_LTO = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				POEDIT_FEATURES = "";
-				POEDIT_VERSION = 3.0.1;
+				POEDIT_VERSION = 3.1;
 				SDKROOT = macosx;
 				WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1";
 			};
diff --git a/configure.ac b/configure.ac
index dec9ce33fa..3619b94127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT([poedit], [3.0.1], [help@poedit.net])
+AC_INIT([poedit], [3.1], [help@poedit.net])
 
 AC_CONFIG_AUX_DIR([admin])
 AC_CONFIG_MACRO_DIR([admin])
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d3874859d3..93d6b747a1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: poedit
-version: "3.0.1"
+version: "3.1"
 summary: Simple translation editor
 description: >
   Translation editor for gettext (PO files) and XLIFF.
diff --git a/src/version.h b/src/version.h
index f0534c4471..3b85dede65 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #ifndef Poedit_version_h
 #define Poedit_version_h
 
-#define POEDIT_VERSION           "3.0.1"
-#define POEDIT_VERSION_WIN        3,0,1
+#define POEDIT_VERSION           "3.1"
+#define POEDIT_VERSION_WIN        3,1,0
 
 #endif // Poedit_version_h
diff --git a/win32/poedit.iss b/win32/poedit.iss
index d477bf2bea..178312ae96 100644
--- a/win32/poedit.iss
+++ b/win32/poedit.iss
@@ -30,7 +30,7 @@
 
 #include "../" + CONFIG + "/git_build_number.h"
 
-#define VERSION          "3.0.1"
+#define VERSION          "3.1"
 #define VERSION_WIN      VERSION + "." + Str(POEDIT_GIT_BUILD_NUMBER)
 
 #ifndef CRT_REDIST
diff --git a/win32/version.props b/win32/version.props
index ea07e2102c..ab91a9316f 100644
--- a/win32/version.props
+++ b/win32/version.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PoeditVersion>3.0.1</PoeditVersion>
+    <PoeditVersion>3.1</PoeditVersion>
   </PropertyGroup>
 </Project>