diff --git a/[refs] b/[refs]
index e6fb20975108..d52e3ac0eb49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56bae802681116dc279c40218b146b5a0c553a3b
+refs/heads/master: 979570e02981d4a8fc20b3cc8fd651856c98ee9d
diff --git a/trunk/Makefile b/trunk/Makefile
index ae6928cc59d3..a3c11d589681 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 3
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
-NAME = Saber-toothed Squirrel
+EXTRAVERSION = -rc7
+NAME = Terrified Chipmunk
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"