diff --git a/.gitignore b/.gitignore
index 8c4642b..1d5c84b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/librdmacm-1.0.21.tar.gz
+SOURCES/librdmacm-1.1.0.tar.gz
diff --git a/.librdmacm.metadata b/.librdmacm.metadata
index 78e17d6..8cf846d 100644
--- a/.librdmacm.metadata
+++ b/.librdmacm.metadata
@@ -1 +1 @@
-eec9a2e50fe5d51288a340a058ff4bf3ffdb67e9 SOURCES/librdmacm-1.0.21.tar.gz
+d38867c3c7501471797f9bc952212d0c68cd3e50 SOURCES/librdmacm-1.1.0.tar.gz
diff --git a/SOURCES/0001-librdmacm-fix-udpong-segfault-on-rconnect-error.patch b/SOURCES/0001-librdmacm-fix-udpong-segfault-on-rconnect-error.patch
new file mode 100644
index 0000000..ed54339
--- /dev/null
+++ b/SOURCES/0001-librdmacm-fix-udpong-segfault-on-rconnect-error.patch
@@ -0,0 +1,40 @@
+From 2fd5322db77c0b1ff441169682e1531b0bfbae4e Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 22 Jun 2016 09:12:28 -0400
+Subject: [PATCH librdmacm] fix udpong segfault on rconnect error
+
+Before patch:
+[root@rdma-qe-05 librdmacm (master *)]$ udpong -s 172.31.45.4
+name      bytes   xfers   total       time     Gb/sec    usec/xfer
+rconnect: No such file or directory
+Segmentation fault (core dumped)
+
+After patch:
+[root@rdma-qe-05 librdmacm (master *)]$ ./examples/udpong -s 172.31.45.4
+name      bytes   xfers   total       time     Gb/sec    usec/xfer
+rconnect: No such file or directory
+
+Simple fix, just a missing goto on error, so we don't try to do things
+that are already expected to fail.
+
+CC: Sean Hefty <sean.hefty@intel.com>
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ examples/udpong.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/udpong.c b/examples/udpong.c
+index 97713a2..6affc62 100644
+--- a/examples/udpong.c
++++ b/examples/udpong.c
+@@ -427,6 +427,7 @@ static int client_connect(void)
+ 	if (ret) {
+ 		perror("rconnect");
+ 		rs_close(rs);
++		goto out;
+ 	}
+ 
+ 	msg.op = msg_op_login;
+-- 
+1.8.3.1
+
diff --git a/SPECS/librdmacm.spec b/SPECS/librdmacm.spec
index 822aa39..3d76a3e 100644
--- a/SPECS/librdmacm.spec
+++ b/SPECS/librdmacm.spec
@@ -1,13 +1,16 @@
 %define _hardened_build 1
 
 Name: librdmacm
-Version: 1.0.21
-Release: 1%{?dist}
+Version: 1.1.0
+Release: 2%{?dist}
 Summary: Userspace RDMA Connection Manager
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://www.openfabrics.org/
+# See also: https://github.com/ofiwg/librdmacm
 Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
+# submitted upstream 20160622: http://marc.info/?l=linux-rdma&m=146660138612895&w=2
+Patch1: 0001-librdmacm-fix-udpong-segfault-on-rconnect-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel > 1.1.5 chrpath ibacm-devel
 %ifnarch ia64 %{sparc} s390 s390x
@@ -42,6 +45,7 @@ Example test programs for the librdmacm library.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %ifnarch ia64 %{sparc} s390 s390x
@@ -93,6 +97,14 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jun 22 2016 Jarod Wilson <jarod@redhat.com> - 1.1.0-2
+- Fix udpong segfault on rconnect error
+- Resolves: bz1081922
+
+* Wed May 04 2016 Jarod Wilson <jarod@redhat.com> - 1.1.0-1
+- Update to upstream v1.1.0 release
+- Related: bz1081922
+
 * Fri Jun 05 2015 Doug Ledford <dledford@redhat.com> - 1.0.21-1
 - Update to latest upstream release
 - Build on s390