diff --git a/opensm.spec b/opensm.spec
index fd65bcb..f216f9e 100644
--- a/opensm.spec
+++ b/opensm.spec
@@ -1,6 +1,6 @@
 Name:    opensm
 Version: 3.3.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: OpenIB InfiniBand Subnet Manager and management utilities
 Group:   System Environment/Daemons
 License: GPLv2 or BSD
@@ -15,7 +15,7 @@ Source7: opensm.rwtab
 Patch0:  opensm-3.3.17-prefix.patch
 
 BuildRequires: libibmad-devel >= 1.3.9, libtool, bison, flex, byacc, systemd
-Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}, logrotate, rdma
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -38,16 +38,16 @@ Shared libraries for Infiniband user space access
 
 %package devel
 Summary: Development files for the opensm-libs libraries
-Group: Development/System
-Requires: %{name}-libs = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 Development environment for the opensm libraries
 
 %package static
 Summary: Static version of the opensm libraries
-Group: Development/System
-Requires: %{name}-devel = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 Static version of opensm libraries
 
@@ -98,7 +98,7 @@ fi
 %files
 %dir /var/cache/opensm
 %{_sbindir}/*
-%{_mandir}/*
+%{_mandir}/*/*
 %{_unitdir}/*
 %{_libexecdir}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/opensm
@@ -118,6 +118,11 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Thu May 29 2014 Michael Schwendt <mschwendt@fedoraproject.org> - 3.3.17-2
+- Don't include manual page directories (#1089412).
+- Use standard group Development/Libraries in library devel packages.
+- Use %%?_isa in base package dependencies.
+
 * Mon Mar 17 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.3.17-1
 - Update to 3.3.17