diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0b9c3c7630e..a2278b77c1b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,7 +7,7 @@
 Changelog
 ---------
 
-v2.5.0 2015-12-17
+v2.5.1 2015-12-17
 =================
 
 Note: This version requires a requirements upgrade on source installations
@@ -66,6 +66,12 @@ Changes and deprecations
   next minor version of CKAN will require Postgresql 9.2 or later.
 
 
+v2.5.0 2015-12-17
+=================
+
+Cancelled release
+
+
 v2.4.2 2015-12-17
 =================
 
diff --git a/ckan/__init__.py b/ckan/__init__.py
index 48323a1c567..f2faf2cd89f 100644
--- a/ckan/__init__.py
+++ b/ckan/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.5.0'
+__version__ = '2.5.1'
 
 __description__ = 'CKAN Software'
 __long_description__ = \
diff --git a/setup.py b/setup.py
index 8d28eb820b9..91cffc40b8c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,8 @@
+# Avoid problem releasing to pypi from vagrant
+import os
+if os.environ.get('USER', '') == 'vagrant':
+    del os.link
+
 try:
     from setuptools import setup, find_packages
 except ImportError: