diff --git a/.gitignore b/.gitignore
index 19315e3..8190d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1 @@
-i386/
-i686/
-x86_64/
-ppc/
-ppc64/
-ia64/
-mips/
-arm*/
-noarch/
-.project
-*.src.rpm
-.build*.log
-/infiniband-diags-1.5.12/
-/infiniband-diags-1.5.12.tar.gz
-/infiniband-diags-1.6.1.tar.gz
-/infiniband-diags-1.6.1/
+/infiniband-diags-1.*.tar.gz
diff --git a/infiniband-diags.spec b/infiniband-diags.spec
index 1d2324b..545a028 100644
--- a/infiniband-diags.spec
+++ b/infiniband-diags.spec
@@ -1,19 +1,20 @@
+Name:    infiniband-diags 
 Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
-Name: infiniband-diags 
-Version: 1.6.1
-Release: 6%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 # Upstream allows either license to be used
 License: GPLv2 or BSD
-Group: System Environment/Libraries
-Url: http://openfabrics.org/
+Group:   System Environment/Libraries
+Url:     http://openfabrics.org/
 Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
+
 #Patch0: infiniband-diags-1.5.8-all_hcas.patch
 Patch1: infiniband-diags-1.6.1-hostname.patch
 
 BuildRequires: opensm-devel > 3.3.8, libibumad-devel, libibmad-devel, perl
 Provides: perl(IBswcountlimits)
 Obsoletes: openib-diags < 1.3
-ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
+ExcludeArch: s390 s390x
 
 # Find the correct directory to install the perl module into.
 %global _perldir %(perl -e 'use Config; print $Config{installvendorarch};')
@@ -74,6 +75,10 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/*.{pl,sh}
 %{_libdir}/*.a
 
 %changelog
+* Mon Mar 17 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.6.4-1
+- Update to 1.6.4
+- Sync Exclude/Exclusive with other OpenFabric packages
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 83f7f4a..2628798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d250e63f849b017f7149046c003cc8f6  infiniband-diags-1.6.1.tar.gz
+01fe2c5f60c2bd2975018bc572190fe4  infiniband-diags-1.6.4.tar.gz