diff --git a/kernel/audit.c b/kernel/audit.c
index f1ca116..cdc5a91 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -139,6 +139,7 @@ static int	   audit_freelist_count;
 static LIST_HEAD(audit_freelist);
 
 static struct sk_buff_head audit_skb_queue;
+static struct sk_buff_head audit_skb_multicast_queue;
 /* queue of skbs to send to auditd when/if it comes back */
 static struct sk_buff_head audit_skb_hold_queue;
 static struct task_struct *kauditd_task;
@@ -468,7 +469,8 @@ static void kauditd_send_multicast_skb(struct sk_buff *skb, gfp_t gfp_mask)
 	if (!copy)
 		return;
 
-	nlmsg_multicast(sock, copy, 0, AUDIT_NLGRP_READLOG, gfp_mask);
+	skb_queue_tail(&audit_skb_multicast_queue, copy);
+	wake_up_interruptible(&kauditd_wait);
 }
 
 /*
@@ -509,6 +511,26 @@ static void flush_hold_queue(void)
 	consume_skb(skb);
 }
 
+static void flush_multicast_queue(void)
+{
+	struct audit_net *aunet = net_generic(&init_net, audit_net_id);
+	struct sock *sock = aunet->nlsk;
+	struct sk_buff *skb = skb_dequeue(&audit_skb_multicast_queue);
+
+	if (!netlink_has_listeners(sock, AUDIT_NLGRP_READLOG)) {
+		while (skb) {
+			consume_skb(skb);
+			skb = skb_dequeue(&audit_skb_multicast_queue);
+		}
+		return;
+	}
+
+	while (skb) {
+		nlmsg_multicast(sock, skb, 0, AUDIT_NLGRP_READLOG, GFP_KERNEL);
+		skb = skb_dequeue(&audit_skb_multicast_queue);
+	}
+}
+
 static int kauditd_thread(void *dummy)
 {
 	set_freezable();
@@ -517,6 +539,8 @@ static int kauditd_thread(void *dummy)
 
 		flush_hold_queue();
 
+		flush_multicast_queue();
+
 		skb = skb_dequeue(&audit_skb_queue);
 
 		if (skb) {
@@ -530,7 +554,8 @@ static int kauditd_thread(void *dummy)
 			continue;
 		}
 
-		wait_event_freezable(kauditd_wait, skb_queue_len(&audit_skb_queue));
+		wait_event_freezable(kauditd_wait, skb_queue_len(&audit_skb_queue)
+						   || skb_queue_len(&audit_skb_multicast_queue));
 	}
 	return 0;
 }
@@ -1197,6 +1222,7 @@ static int __init audit_init(void)
 	register_pernet_subsys(&audit_net_ops);
 
 	skb_queue_head_init(&audit_skb_queue);
+	skb_queue_head_init(&audit_skb_multicast_queue);
 	skb_queue_head_init(&audit_skb_hold_queue);
 	audit_initialized = AUDIT_INITIALIZED;
 	audit_enabled = audit_default;