diff --git a/config-powerpc64 b/config-powerpc64
index 46ffe87c9..ccd0e85d4 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -164,8 +164,8 @@ CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
-# CONFIG_HW_RANDOM_PSERIES is not set
-# CONFIG_CRYPTO_DEV_NX is not set
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_CRYPTO_DEV_NX=m
 
 
 CONFIG_BPF_JIT=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 7e2ea454b..ef6ac78e1 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -155,8 +155,8 @@ CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
 CONFIG_HW_RANDOM_AMD=m
 
-# CONFIG_HW_RANDOM_PSERIES is not set
-# CONFIG_CRYPTO_DEV_NX is not set
+CONFIG_HW_RANDOM_PSERIES=m
+CONFIG_CRYPTO_DEV_NX=m
 
 
 CONFIG_BPF_JIT=y
diff --git a/kernel.spec b/kernel.spec
index bd41e9720..bb0e20850 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2315,6 +2315,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Sep 18 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc6.git1.1
+- Linux v3.6-rc6-25-g4651afb
+- Enable POWER7+ crypto modules (rhbz 857971)
+
 * Mon Sep 17 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc6.git0.2
 - Reenable debugging options.
 
diff --git a/sources b/sources
index 1f1499ae3..6863601c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 24153eaaa81dedc9481ada8cd9c3b83d  linux-3.5.tar.xz
 509f0571ddeb157c6c5fd7347816e2b8  patch-3.6-rc6.xz
+b4f60c62b22d1503702bfe6ed6b72d47  patch-3.6-rc6-git1.xz