diff --git a/gitrev b/gitrev
index f862a08ad..8213fd9fa 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-5997aab0a11ea27ee8e520ecc551ed18fd3e8296
+bee797529d7c1ea4e2803fda067d20edbc00bc3d
diff --git a/kernel.spec b/kernel.spec
index 53de3c966..943cded59 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -122,7 +122,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -1853,6 +1853,10 @@ fi
 #
 #
 %changelog
+* Thu May 24 2018 Justin M. Forbes <jforbes@redhat.com> - 4.17.0-0.rc6.git2.1
+- Linux v4.17-rc6-158-gbee797529d7c
+- Reenable debugging options.
+
 * Mon May 21 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc6.git1.1
 - Linux v4.17-rc6-146-g5997aab0a11e
 
diff --git a/sources b/sources
index 9841d55ab..d9fb196d0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 SHA512 (patch-4.17-rc6.xz) = d8d67897e741b5ba91dbb3c6660e9289364938755f2f03031264206e85dd9b2a5101e36b4736ced9b58d092573ef5943c0cfd8d929da85143be2215b10478c55
-SHA512 (patch-4.17-rc6-git1.xz) = d1fcccfd5721d593ab0998397f6ef89866f761ac44120c7d0d692c062d9906b81ec0c29c51869f7ef0e5549321f7809092c1fd0ee86657b7a5fd41da96da0d58
+SHA512 (patch-4.17-rc6-git2.xz) = a68c80ec48cc9bb99cd3b8b2e71a05d97ccc8acf9441f93d71413e4e63a76b69a2996061e7015a5a66061a923e1efa711f66c02a96ee13075165df2a165f6168