diff --git a/[refs] b/[refs]
index d63ae6a4d385..d75ebc2c2268 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58edf8ee5e3319373dae9d9038e1a8469a83bb76
+refs/heads/master: 8e4921515c1a379539607eb443d51c30f4f7f338
diff --git a/trunk/Makefile b/trunk/Makefile
index 7715b2c14fb4..681c1d23b4d4 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*