diff --git a/.gitignore b/.gitignore
index 0e1a91e..f11cf75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /devscripts_2.16.2.tar.xz
 /devscripts_2.16.4.tar.xz
 /devscripts_2.16.5.tar.xz
+/devscripts_2.16.6.tar.xz
diff --git a/devscripts.spec b/devscripts.spec
index db2ed84..c4f7ea9 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,5 +1,5 @@
 Name:           devscripts
-Version:        2.16.5
+Version:        2.16.6
 Release:        1%{?dist}
 Summary:        Scripts for Debian Package maintainers
 
@@ -13,14 +13,9 @@ Patch1:         devscripts_install-layout.patch
 # Install some additional man pages
 Patch2:         devscripts_install-man.patch
 
-# rpmdevtools < 8.4 bundled some of the scripts provided by this package
-Conflicts:      rpmdevtools < 8.4
-
 BuildRequires:  perl
 BuildRequires:  perl-generators
-BuildRequires:  perl(autodie)
 BuildRequires:  perl(base)
-BuildRequires:  perl(Carp)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Cwd)
 BuildRequires:  perl(Data::Dumper)
@@ -28,14 +23,12 @@ BuildRequires:  perl(DB_File)
 BuildRequires:  perl(Digest::MD5)
 BuildRequires:  perl(Dpkg::Changelog::Debian)
 BuildRequires:  perl(Dpkg::Changelog::Parse)
-BuildRequires:  perl(Dpkg::Compression)
 BuildRequires:  perl(Dpkg::Control)
 BuildRequires:  perl(Dpkg::Control::Hash)
 BuildRequires:  perl(Dpkg::Vendor)
 BuildRequires:  perl(Dpkg::Version)
 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Encode::Locale)
-BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Fcntl)
 BuildRequires:  perl(feature)
 BuildRequires:  perl(File::Basename)
@@ -58,17 +51,13 @@ BuildRequires:  perl(Net::SMTP)
 BuildRequires:  perl(open)
 BuildRequires:  perl(Parse::DebControl)
 BuildRequires:  perl(Pod::Checker)
-BuildRequires:  perl(Pod::Text)
-BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(strict)
-BuildRequires:  perl(Symbol)
 BuildRequires:  perl(Text::ParseWords)
 BuildRequires:  perl(Text::Wrap)
 BuildRequires:  perl(URI) >= 1.37
 BuildRequires:  perl(URI::QueryParam)
-BuildRequires:  perl(utf8)
 BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings)
 
@@ -82,26 +71,35 @@ BuildRequires:  /usr/bin/dpkg-vendor
 BuildRequires:  /usr/bin/dpkg-parsechangelog
 BuildRequires:  pkgconfig(bash-completion)
 
-Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       dpkg-dev
 Requires:       sensible-utils
 # man for manpage-alert
 Requires:       %{_bindir}/man
 
-Requires: %{name}-minimal
+Requires:       %{name}-checkbashisms
 
 
 %description
 Scripts to make the life of a Debian Package maintainer easier.
 
+%package checkbashisms
+Summary:        Devscripts checkbashisms script
+
+%description checkbashisms
+This package contains the devscripts checkbashisms script.
 
-%package minimal
-Summary:        Minimal subset of devscripts
 
-%description minimal
-This package contains the following subset of the devscripts scripts:
-- licensecheck
-- checkbashisms
+%package compat
+Summary:        Compatibility package for devscripts-minimal
+Requires:       licensecheck
+Requires:       %{name}-checkbashisms = %{version}-%{release}
+Obsoletes:      devscripts-minimal < 2.16.6-1
+
+%description compat
+This package only exists to help transition from devscripts-minimal to
+licensecheck and devscripts-checkbashisms. It will be removed after one
+distribution release cycle, please do not reference it or depend on it in any way.
 
 
 %prep
@@ -112,7 +110,7 @@ This package contains the following subset of the devscripts scripts:
 
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
+%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
 
 
 %install
@@ -151,19 +149,29 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/bts
 %{_mandir}/man1/*
 %{perl_vendorlib}/Devscripts
 %exclude %{_bindir}/checkbashisms
-%exclude %{_bindir}/licensecheck
 %exclude %{_mandir}/man1/checkbashisms.1*
-%exclude %{_mandir}/man1/licensecheck.1*
+%exclude %{_datadir}/bash-completion/completions/checkbashisms
 
-%files minimal
+%files checkbashisms
 %license COPYING
 %{_bindir}/checkbashisms
-%{_bindir}/licensecheck
 %{_mandir}/man1/checkbashisms.1*
-%{_mandir}/man1/licensecheck.1*
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/checkbashisms
 
+%files compat
+# Empty
 
 %changelog
+* Wed Jul 06 2016 Sandro Mani <manisandro@gmail.com> - 2.16.6-1
+- Update to 2.16.6
+- Introduce devscripts-checkbashisms
+- Introduce devscripts-compat compatibility package for
+  devscripts-minimal -> {devscripts-checkbashisms, licensecheck} transition
+- Remove Conflicts: rpmdevtools < 8.4, no current version of Fedora ships rpmdevtools < 8.4
+- Drop unused BRs
+
 * Sun Jun 05 2016 Sandro Mani <manisandro@gmail.com> - 2.16.5-1
 - Update to 2.16.5
 
diff --git a/sources b/sources
index 0cf1f64..76d63c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a46ead9163102b60d27de67ce62dc4c1  devscripts_2.16.5.tar.xz
+d49c996acbed9b339328f663b41c8a7a  devscripts_2.16.6.tar.xz