diff --git a/debian/changelog b/debian/changelog
index df886d8c3..36c943eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux-2.6 (3.2~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (3.2~rc4-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
 
diff --git a/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch b/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
index cb7cca579..386f5cc01 100644
--- a/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
+++ b/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
@@ -10,7 +10,7 @@ delivery problem for real.
 
 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 Signed-off-by: Ingo Molnar <mingo@elte.hu>
-
+[bwh: Adjust context in __remove_hrtimer() for v3.2-rc4]
 ---
  include/linux/hrtimer.h  |    3 
  kernel/hrtimer.c         |  190 ++++++++++++++++++++++++++++++++++++++++++-----
@@ -127,9 +127,9 @@ Index: linux-3.2/kernel/hrtimer.c
 +		goto out;
 +	}
 +
- 	if (&timer->node == timerqueue_getnext(&base->active)) {
- #ifdef CONFIG_HIGH_RES_TIMERS
- 		/* Reprogram the clock event device. if enabled */
+ 	next_timer = timerqueue_getnext(&base->active);
+ 	timerqueue_del(&base->active, &timer->node);
+ 	if (&timer->node == next_timer) {
 @@ -1176,6 +1210,7 @@ static void __hrtimer_init(struct hrtime
  
  	base = hrtimer_clockid_to_base(clock_id);