diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec
index cd77dd4..24246b3 100644
--- a/telepathy-mission-control.spec
+++ b/telepathy-mission-control.spec
@@ -2,11 +2,10 @@
 
 Name:           telepathy-mission-control
 Version:        5.16.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Central control for Telepathy connection manager
 
-Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://telepathy.freedesktop.org/wiki/Mission_Control
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
@@ -24,6 +23,7 @@ BuildRequires:  pygobject2
 BuildRequires:  python-twisted-core
 BuildRequires:  telepathy-glib-devel >= %{tp_glib_ver}
 BuildRequires:  gtk-doc
+BuildRequires:  pkgconfig
 
 
 %description
@@ -36,13 +36,7 @@ account definitions and credentials.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       dbus-devel
-Requires:       dbus-glib-devel
-Requires:       telepathy-glib-devel >= %{tp_glib_ver}
-
-
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description    devel
 The %{name}-devel package contains libraries and header
 files for developing applications that use %{name}.
@@ -54,7 +48,11 @@ files for developing applications that use %{name}.
 
 
 %build
-%configure --disable-static --enable-gtk-doc --enable-mcd-plugins --with-connectivity=nm --disable-upower
+%configure \
+  --disable-static \
+  --enable-gtk-doc \
+  --with-connectivity=nm \
+  --disable-upower
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -65,11 +63,17 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 
-# Remove lib64 rpaths
+%global mc_plugindir %(PKGCONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig pkg-config --variable=plugindir mission-control-plugins 2>/dev/null)
+
+# create/own plugin dir
+mkdir -p %{buildroot}%{mc_plugindir}
+
+# Remove rpaths if present
+chrpath --list   %{buildroot}%{_libexecdir}/mission-control-5 && \
 chrpath --delete %{buildroot}%{_libexecdir}/mission-control-5
 
 # Remove .la files
-find %{buildroot} -name '*.la' -delete
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
 %check
@@ -93,23 +97,34 @@ fi
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc AUTHORS NEWS
-%{_bindir}/*
-%{_datadir}/dbus-1/services/*.service
+%{_bindir}/mc-tool
+%{_bindir}/mc-wait-for-name
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
 %{_datadir}/glib-2.0/schemas/im.telepathy.MissionControl.FromEmpathy.gschema.xml
-%{_libdir}/libmission-control-plugins.so.*
+%{_libdir}/libmission-control-plugins.so.0*
+%dir %{mc_plugindir}/
 %{_libexecdir}/mission-control-5
-%{_mandir}/man*/*.gz
-
+%{_mandir}/man1/mc-tool.1*
+%{_mandir}/man1/mc-wait-for-name.1*
 
 %files devel
 %doc %{_datadir}/gtk-doc/html/mission-control-plugins
-%{_includedir}/*
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/mission-control-5.5/
+%{_libdir}/pkgconfig/mission-control-plugins.pc
 %{_libdir}/libmission-control-plugins.so
+%{_mandir}/man8/mission-control-5.8*
 
 
 %changelog
-* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 5.16.3-3
+* Wed Oct 14 2015 Rex Dieter <rdieter@fedoraproject.org> - 1:5.16.3-4
+- -devel: tighten subpkg dep via %%{?_isa}, rely on pkgconfig auto deps
+- tighten file lists, track libsoname
+- own /usr/lib*/mission-control-plugins.0
+- %%build: drop unused --enable-mcd-plugins option
+- .spec cosmetics, drop Group: tags
+
+* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1:5.16.3-3
 - Use %%license
 - Don't fail build on check fail (fix FTBFS)