diff --git a/[refs] b/[refs]
index d557217981d3..5e31ee6366b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 075cb105cb6dcda8a585989ebd4a71f0b3c33f3e
+refs/heads/master: 1ea6b8f48918282bdca0b32a34095504ee65bab5
diff --git a/trunk/Makefile b/trunk/Makefile
index ed25c5b35470..361e4f00e6b9 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 3
-PATCHLEVEL = 1
+PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION =
-NAME = "Divemaster Edition"
+EXTRAVERSION = -rc1
+NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"