diff --git a/[refs] b/[refs]
index ca6e1929e5d5..cb80683ebc92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af23f573e817642479fdd05e2b5da5b268eacfaf
+refs/heads/master: 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f
diff --git a/trunk/Makefile b/trunk/Makefile
index 59cf6dacec07..df6ce3e80090 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*