Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 4874c2dc3da3748951cb71f24805c35b88106d0f)
+++ kernel/generic/include/ipc/ipc.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -175,12 +175,13 @@
 	waitq_t wq;
 
-	link_t connected_phones; /**< Phones connected to this answerbox */
-	link_t calls;            /**< Received calls */
-	link_t dispatched_calls; /* Should be hash table in the future */
-
-	link_t answers;          /**< Answered calls */
+	link_t connected_phones;	/**< Phones connected to this answerbox */
+	link_t calls;			/**< Received calls */
+	link_t dispatched_calls;	/* Should be hash table in the future */
+
+	link_t answers;			/**< Answered calls */
 
 	SPINLOCK_DECLARE(irq_lock);
-	link_t irq_notifs;       /**< Notifications from IRQ handlers */
+	link_t irq_notifs;       	/**< Notifications from IRQ handlers */
+	link_t irq_head;		/**< IRQs with notifications to this answerbox. */
 };
 
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision 4874c2dc3da3748951cb71f24805c35b88106d0f)
+++ kernel/generic/include/ipc/irq.h	(revision a000fd71083ee6c3d075fc87d57f7801ca6dd58b)
@@ -72,4 +72,5 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <adt/list.h>
 
 /** IPC notification config structure.
@@ -84,4 +85,7 @@
 	irq_code_t *code;		/**< Top-half pseudocode. */
 	count_t counter;		/**< Counter. */
+	link_t link;			/**< Link between IRQs that are notifying the
+					     same answerbox. The list is protected by
+					     the answerbox irq_lock. */
 };