diff --git a/[refs] b/[refs]
index fac7a0d68ee2..7c944e5fbb93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd1bfe40ac6bdf9593da29b822bc301b77a97d6a
+refs/heads/master: 55922c9d1b84b89cb946c777fddccb3247e7df2c
diff --git a/trunk/Makefile b/trunk/Makefile
index 529d93fa2430..afb8e0d26f2c 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
-VERSION = 2
-PATCHLEVEL = 6
-SUBLEVEL = 39
-EXTRAVERSION =
-NAME = Flesh-Eating Bats with Fangs
+VERSION = 3
+PATCHLEVEL = 0
+SUBLEVEL = 0
+EXTRAVERSION = -rc1
+NAME = Sneaky Weasel
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"