diff --git a/.gitignore b/.gitignore
index 2f96426..63dd1b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libcxgb4-1.2.0.tar.gz
+SOURCES/libcxgb4-1.3.5.tar.gz
diff --git a/.libcxgb4.metadata b/.libcxgb4.metadata
index 869c4d9..b84b580 100644
--- a/.libcxgb4.metadata
+++ b/.libcxgb4.metadata
@@ -1 +1 @@
-78e1c29564cc444ecd05660545be1ab524447816 SOURCES/libcxgb4-1.2.0.tar.gz
+d0dbdce8c5f7d1bb24cb567ee75f2d48497210cd SOURCES/libcxgb4-1.3.5.tar.gz
diff --git a/SOURCES/libcxgb4-1.1.0-type.patch b/SOURCES/libcxgb4-1.1.0-type.patch
deleted file mode 100644
index 7150ecf..0000000
--- a/SOURCES/libcxgb4-1.1.0-type.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcxgb4-1.1.0/src/t4.h.save	2011-02-03 18:23:03.612796608 -0500
-+++ libcxgb4-1.1.0/src/t4.h	2011-02-03 18:23:22.489655272 -0500
-@@ -51,7 +51,7 @@
- #define __be64 uint64_t
- #define u64 uint64_t
- #define DECLARE_PCI_UNMAP_ADDR(a)
--#define dma_addr_t uint64_t
-+// #define dma_addr_t uint64_t
- #define __iomem
- #define cpu_to_be16 htons
- #define cpu_to_be32 htonl
diff --git a/SOURCES/libcxgb4-1.2.0-alias.patch b/SOURCES/libcxgb4-1.2.0-alias.patch
deleted file mode 100644
index 4c2b7d2..0000000
--- a/SOURCES/libcxgb4-1.2.0-alias.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libcxgb4-1.2.0/Makefile.am.old	2011-11-09 10:57:03.000000000 -0500
-+++ libcxgb4-1.2.0/Makefile.am	2013-02-07 15:02:26.000000000 -0500
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = src/libcxgb4.la
- 
--AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DNDEBUG -DOVERFLOW_DETECTION
-+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DNDEBUG -DOVERFLOW_DETECTION -fno-strict-aliasing
- 
- if HAVE_LD_VERSION_SCRIPT
-     cxgb4_version_script = -Wl,--version-script=$(srcdir)/src/cxgb4.map
---- libcxgb4-1.2.0/Makefile.in.old	2013-02-07 15:09:28.000000000 -0500
-+++ libcxgb4-1.2.0/Makefile.in	2013-02-07 15:09:58.000000000 -0500
-@@ -195,7 +195,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- lib_LTLIBRARIES = src/libcxgb4.la
--AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DNDEBUG -DOVERFLOW_DETECTION
-+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DNDEBUG -DOVERFLOW_DETECTION -fno-strict-aliasing
- @HAVE_LD_VERSION_SCRIPT_FALSE@cxgb4_version_script = 
- @HAVE_LD_VERSION_SCRIPT_TRUE@cxgb4_version_script = -Wl,--version-script=$(srcdir)/src/cxgb4.map
- src_libcxgb4_la_SOURCES = src/cq.c src/dev.c src/qp.c src/verbs.c src/sim.c
diff --git a/SOURCES/libcxgb4-modprobe.conf b/SOURCES/libcxgb4-modprobe.conf
deleted file mode 100644
index 7fd73c2..0000000
--- a/SOURCES/libcxgb4-modprobe.conf
+++ /dev/null
@@ -1 +0,0 @@
-install cxgb4 /sbin/modprobe --ignore-install cxgb4 && /sbin/modprobe iw_cxgb4
diff --git a/SPECS/libcxgb4.spec b/SPECS/libcxgb4.spec
index 2901982..36ead91 100644
--- a/SPECS/libcxgb4.spec
+++ b/SPECS/libcxgb4.spec
@@ -1,17 +1,15 @@
 Name: libcxgb4
-Version: 1.2.0
-Release: 6%{?dist}
+Version: 1.3.5
+Release: 2%{?dist}
 Summary: Chelsio T4 iWARP HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://www.openfabrics.org/
 Source: http://www.openfabrics.org/downloads/cxgb4/%{name}-%{version}.tar.gz
-Source1: libcxgb4-modprobe.conf
-Patch0:  libcxgb4-1.1.0-type.patch
-Patch1:	 libcxgb4-1.2.0-alias.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel >= 1.1.3, libtool
 Obsoletes: %{name}-devel
+Requires: rdma
 ExcludeArch: s390 s390x
 Provides: libibverbs-driver.%{_arch}
 %description
@@ -27,17 +25,14 @@ Static version of libcxgb4 that may be linked directly to an application.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-install -p -m 644 -D %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/libcxgb4.conf
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -48,7 +43,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
 %{_sysconfdir}/libibverbs.d/*.driver
-%{_sysconfdir}/modprobe.d/libcxgb4.conf
 %doc AUTHORS COPYING README
 
 %files static
@@ -56,6 +50,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Tue Dec 23 2014 Doug Ledford <dledford@redhat.com> - 1.3.5-2
+- Rebuild without modprobe file
+- Add requires on rdma package that now contains modprobe file
+- Related: bz1164618
+
+* Fri Oct 17 2014 Doug Ledford <dledford@redhat.com> - 1.3.5-1
+- Update to latest upstream release and rebuild against latest libibverbs
+- Related: bz1137044
+
 * Mon Mar 03 2014 Doug Ledford <dledford@redhat.com> - 1.2.0-6
 - Our -fno-strict-alias option patch was lost, and we discovered it
   was lost when I rebuilt the package.  Put it back and rebuild