diff --git a/NEWS b/NEWS
index 23e86eeb4b37cc5bbedd9c8c3bda05e772e0ae0c..50c0979dbb027126bfb7a90b0c2c845ceedec882 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,26 @@ Version 2.4.0 rc1
   ``…/ganeti/rapi/users``
 
 
+Version 2.3.1 rc1
+-----------------
+
+*(Released Wed, 1 Dec 2010)*
+
+- impexpd: Disable OpenSSL compression in socat if possible (backport
+  from master, commit e90739d625b, see :doc:`installation guide
+  <install-quick>` for details)
+- Changed unittest coverage report to exclude test scripts
+- Added script to check version format
+
+
+Version 2.3.0
+-------------
+
+*(Released Wed, 1 Dec 2010)*
+
+Released version 2.3.0~rc1 without any changes.
+
+
 Version 2.3.0 rc1
 -----------------
 
diff --git a/configure.ac b/configure.ac
index 1595d9dfde51f6b244797c33e6d4be0a7c092c4d..e1fb4979821bf9889059dd9b29dc23f2ddb2dc45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [3])
-m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_revision], [1])
 m4_define([gnt_version_suffix], [~rc1])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
diff --git a/lib/locking.py b/lib/locking.py
index 140d8342bde8d60b97daaf26445d12a5a1bb7c89..20a15179c242a32ad21772a26c81138a2e3dd0c3 100644
--- a/lib/locking.py
+++ b/lib/locking.py
@@ -1047,8 +1047,8 @@ class LockSet:
           # element is not there anymore.
           continue
 
-        raise errors.LockError("Non-existing lock %s in set %s" %
-                               (lname, self.name))
+        raise errors.LockError("Non-existing lock %s in set %s (it may have"
+                               " been removed)" % (lname, self.name))
 
       acquire_list.append((lname, lock))
 
@@ -1080,8 +1080,8 @@ class LockSet:
             # particular element is not there anymore.
             continue
 
-          raise errors.LockError("Non-existing lock %s in set %s" %
-                                 (lname, self.name))
+          raise errors.LockError("Non-existing lock %s in set %s (it may"
+                                 " have been removed)" % (lname, self.name))
 
         if not acq_success:
           # Couldn't get lock or timeout occurred