diff --git a/config-armv7-generic b/config-armv7-generic
index 03e2aface..93dead00e 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -240,6 +240,7 @@ CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SOC_WM8978=m
 CONFIG_SUNXI_RSB=y
 CONFIG_NVMEM_SUNXI_SID=m
 
diff --git a/kernel.spec b/kernel.spec
index 1c2e5bd2c..9c0469880 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -795,7 +795,7 @@ This package provides debug information for package kernel-tools.
 # symlinks because of the trailing nonmatching alternation and
 # the leading .*, because of find-debuginfo.sh's buggy handling
 # of matching the pattern against the symlinks file.
-%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
+%{expand:%%global debuginfo_args %{?debuginfo_args} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
 
 %endif # with_tools
 
@@ -1699,6 +1699,9 @@ popd
 pushd tools/iio/
 %{make}
 popd
+pushd tools/gpio/
+%{make}
+popd
 %endif
 
 # In the modsign case, we do 3 things.  1) We check the "flavour" and hard
@@ -1869,6 +1872,9 @@ popd
 pushd tools/iio
 make INSTALL_ROOT=%{buildroot} install
 popd
+pushd tools/gpio
+make DESTDIR=%{buildroot} install
+popd
 %endif
 
 %if %{with_bootwrapper}
@@ -2063,6 +2069,9 @@ fi
 %{_bindir}/iio_event_monitor
 %{_bindir}/iio_generic_buffer
 %{_bindir}/lsiio
+%{_bindir}/lsgpio
+%{_bindir}/gpio-hammer
+%{_bindir}/gpio-event-mon
 %endif
 
 %if %{with_debuginfo}
@@ -2157,9 +2166,10 @@ fi
 #
 #
 %changelog
-* Sat Nov 19 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+* Sun Nov 20 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Various ARMv7/aarch64 updates
 - Enable CEC media input devices
+- Build gpio tools
 - General config cleanups
 
 * Fri Nov 18 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc5.git4.1