diff --git a/clear_message_structure.patch b/clear_message_structure.patch
new file mode 100644
index 0000000..5e0582a
--- /dev/null
+++ b/clear_message_structure.patch
@@ -0,0 +1,28 @@
+From 4382a40e5edc631957542790f9d691a38814d0de Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Wed, 21 Oct 2015 12:46:29 -0400
+Subject: [PATCH] Clear message structure before decoding into it
+
+This resolves a segfault appearing on ARM.
+
+Ticket: https://bugzilla.redhat.com/show_bug.cgi?id=1235902
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ proxy/src/client/gpm_common.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c
+index 6d626e8..93d6c24 100644
+--- a/proxy/src/client/gpm_common.c
++++ b/proxy/src/client/gpm_common.c
+@@ -454,6 +454,7 @@ int gpm_make_call(int proc, union gp_rpc_arg *arg, union gp_rpc_res *res)
+     sockgrab = false;
+ 
+     /* decode header */
++    memset(&msg, 0, sizeof(gp_rpc_msg));
+     xdrok = xdr_gp_rpc_msg(&xdr_reply_ctx, &msg);
+     if (!xdrok) {
+         ret = EINVAL;
+-- 
+2.6.1
+
diff --git a/gssproxy.spec b/gssproxy.spec
index 703d4e5..5a0f940 100644
--- a/gssproxy.spec
+++ b/gssproxy.spec
@@ -1,6 +1,6 @@
 Name:		gssproxy
 Version:	0.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GSSAPI Proxy
 
 Group:		System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %global gpstatedir %{_localstatedir}/lib/gssproxy
 
 ### Patches ###
+Patch0: clear_message_structure.patch
 
 ### Dependencies ###
 
@@ -52,6 +53,7 @@ A proxy for GSSAPI credential handling
 %prep
 %setup -q
 
+%patch0 -p2
 
 %build
 autoreconf -f -i
@@ -103,6 +105,10 @@ rm -rf %{buildroot}
 %systemd_postun_with_restart gssproxy.service
 
 %changelog
+* Wed Oct 21 2015 Robbie Harwood <rharwood@redhat.com> - 0.4.1-3
+- Clear message buffer to fix segfault on arm
+- resolves: #1235902
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild