diff --git a/[refs] b/[refs]
index e38bbf884e26..7de27f3c1217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b37ccfc637be27d9a652fcedc35e6e782c3aa78
+refs/heads/master: 29e8c3c304b62f31b799565c9ee85d42bd163f80
diff --git a/trunk/Makefile b/trunk/Makefile
index a22978413b65..ae78a31a9de2 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 25
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 NAME = Funky Weasel is Jiggy wit it
 
 # *DOCUMENTATION*