diff --git a/[refs] b/[refs]
index 1296d86a49b4..c59ba814509f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 075d6adf909ac8706bd0be7832e6dadb0aef314b
+refs/heads/master: 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e
diff --git a/trunk/Makefile b/trunk/Makefile
index 82f76a96cfe6..7c010f3325a9 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 17
-EXTRAVERSION =
+SUBLEVEL = 18
+EXTRAVERSION = -rc1
 NAME=Crazed Snow-Weasel
 
 # *DOCUMENTATION*