diff --git a/openssh-6.5p1-audit4-kex_results.patch b/openssh-6.5p1-audit4-kex_results.patch
index e54b128..100f1ff 100644
--- a/openssh-6.5p1-audit4-kex_results.patch
+++ b/openssh-6.5p1-audit4-kex_results.patch
@@ -699,9 +699,9 @@ diff --git a/openssh-6.5p1/monitor_wrap.c b/openssh-6.5p1/monitor_wrap.c
 +
 +	buffer_init(&m);
 +	buffer_put_int(&m, ctos);
-+	buffer_put_cstring(&m, cipher);
-+	buffer_put_cstring(&m, mac);
-+	buffer_put_cstring(&m, compress);
++	buffer_put_cstring(&m, cipher ? cipher : "");
++	buffer_put_cstring(&m, mac ? mac : "");
++	buffer_put_cstring(&m, compress ? compress : "");
 +	buffer_put_int64(&m, pid);
 +	buffer_put_int64(&m, uid);
 +
diff --git a/openssh.changes b/openssh.changes
index 32fa829..f10b527 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 25 10:07:18 UTC 2014 - idonmez@suse.com
+
+- Update openssh-6.5p1-audit4-kex_results.patch to ensure that
+  we don't pass a NULL string to buffer_put_cstring. This happens
+  when you have "Ciphers chacha20-poly1305@openssh.com" directive.
+
 -------------------------------------------------------------------
 Mon Mar 17 02:21:13 UTC 2014 - pcerny@suse.com