diff --git a/[refs] b/[refs]
index 302d9c6343f3..135e8fc40be8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99ba18a96195f047546bd515aabf81fda70ef09
+refs/heads/master: b07d68b5ca4d55a16fab223d63d5fb36f89ff42f
diff --git a/trunk/Makefile b/trunk/Makefile
index f3229a4945bf..eb28ccb7a2c0 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc3
-NAME = Holy Dancing Manatees, Batman!
+EXTRAVERSION =-rc4
+NAME = Pink Farting Weasel
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"