diff --git a/[refs] b/[refs]
index d3a1503aaf33..cd0388601602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ea66ab5805daafc60ccb16dd617f610832c76bb
+refs/heads/master: 091438dd5668396328a3419abcbc6591159eb8d1
diff --git a/trunk/Makefile b/trunk/Makefile
index 9e5dc8f0ef47..eb38c8399261 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 30
-EXTRAVERSION = -rc3
-NAME = Temporary Tasmanian Devil
+EXTRAVERSION = -rc4
+NAME = Vindictive Armadillo
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"