diff --git a/[refs] b/[refs]
index 190c7b11d7b9..eeb44cb12d33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 265f2a057bf6b567a32bb16dc8b1765cf0555d9f
+refs/heads/master: 05f45d7d746d07c95588871abf933334856c1a3b
diff --git a/trunk/drivers/rtc/rtc-pcf50633.c b/trunk/drivers/rtc/rtc-pcf50633.c
index 77b40ddd66e6..33a10c47260e 100644
--- a/trunk/drivers/rtc/rtc-pcf50633.c
+++ b/trunk/drivers/rtc/rtc-pcf50633.c
@@ -245,8 +245,9 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 	ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
 				PCF50633_TI_EXTENT, &pcf_tm.time[0]);
 
-	if (!alarm_masked)
+	if (!alarm_masked || alrm->enabled)
 		pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
+	rtc->alarm_enabled = alrm->enabled;
 
 	return ret;
 }