diff --git a/configure.ac b/configure.ac
index e3373a8..39d5036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [2.4])
+AC_INIT([xtables-addons], [2.5])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -63,7 +63,7 @@ if test -n "$kbuilddir"; then
 		echo "WARNING: Version detection did not succeed. Continue at own luck.";
 	else
 		echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
-		if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 13; then
+		if test "$kmajor" -gt 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 15; then
 			echo "WARNING: That kernel version is not officially supported yet. Continue at own luck.";
 		elif test "$kmajor" -eq 3 -a "$kminor" -ge 7; then
 			:;
diff --git a/doc/changelog.txt b/doc/changelog.txt
index a1c23d8..f2e7d51 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,13 @@ HEAD
 ====
 
 
+v2.5 (2014-04-18)
+=================
+Enhancements:
+- Support for Linux 3.14 and 3.15
+- xt_quota2: introduce support for network namespaces
+
+
 v2.4 (2014-01-09)
 =================
 Enhancements:
diff --git a/xtables-addons.8.in b/xtables-addons.8.in
index 763ae54..eddf52c 100644
--- a/xtables-addons.8.in
+++ b/xtables-addons.8.in
@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "US Hoarding All The Cold Edition" "" "v2.4 (2014-01-09)"
+.TH xtables-addons 8 "SFUAN" "" "v2.5 (2014-04-18)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets