diff --git a/[refs] b/[refs]
index 2a8ef66bbf77..7b80cbb899b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3752aee96538b582b089f4a97a26e2ccd9403929
+refs/heads/master: e478bec0ba0a83a48a0f6982934b6de079e7e6b3
diff --git a/trunk/Makefile b/trunk/Makefile
index 47e21c04014e..edfc2fdf76c9 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 18
-EXTRAVERSION = -rc7
-NAME=Crazed Snow-Weasel
+EXTRAVERSION =
+NAME=Avast! A bilge rat!
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"