diff --git a/.mstflint.metadata b/.mstflint.metadata
index a9c7c67..ec56d0a 100644
--- a/.mstflint.metadata
+++ b/.mstflint.metadata
@@ -1 +1 @@
-046023e80a90940c28f18dbfb6ced91154689ab6 SOURCES/mstflint-3.0-0.6.g6961daa.tar.gz
+3d8ae4f58594f5610a6836646076180589850931 SOURCES/mstflint-3.5.0.tar.gz
diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec
index 6189a4f..04e2ad4 100644
--- a/SPECS/mstflint.spec
+++ b/SPECS/mstflint.spec
@@ -1,13 +1,13 @@
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	3.0
-Release:	0.6.g6961daa.1%{?dist}
+Version:	3.5.0
+Release:	1%{?dist}
 License:	GPLv2+ or BSD
 Group:		Applications/System
-Source:		http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.6.g6961daa.tar.gz
+Source:		http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz
 Url:		http://www.openfabrics.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libstdc++-devel, zlib-devel
+BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel
 Obsoletes:	openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0
 ExcludeArch:	s390 s390x
 
@@ -19,8 +19,7 @@ It also provides access to the relevant source code.
 %setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-%configure
+%configure CFLAGS="$CFLAGS -fno-strict-aliasing"
 make
 
 %install
@@ -29,6 +28,7 @@ make DESTDIR=%{buildroot} install
 # Remove the devel files that we don't ship
 rm -fr %{buildroot}%{_includedir}
 rm -fr %{buildroot}%{_datadir}
+rm -fr %{buildroot}%{_libdir}/*.a
 
 %clean
 rm -rf %{buildroot}
@@ -39,6 +39,17 @@ rm -rf %{buildroot}
 %_bindir/*
 
 %changelog
+* Sat Mar 01 2014 Doug Ledford <dledford@redhat.com> - 3.5.0-1
+- Update to latest release for ConnectIB fixes
+- Resolves: bz1060514
+
+* Thu Jan 23 2014 Doug Ledford <dledford@redhat.com> - 3.0-0.7.g6961daa.2
+- Fix for build on arm arches
+- Resolves: bz1055716
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.0-0.7.g6961daa.1
+- Mass rebuild 2013-12-27
+
 * Fri Aug 16 2013 Doug Ledford <dledford@redhat.com> - 3.0-0.6.g6961daa.1
 - Update to latest upstream version, which resovles some licensing issues
   on some of the source files