diff --git a/config-generic b/config-generic
index d64c40bea..6ae82b386 100644
--- a/config-generic
+++ b/config-generic
@@ -4620,7 +4620,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
+CONFIG_EXT4_ENCRYPTION=y
 CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
@@ -4780,8 +4780,7 @@ CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
-# This is labeled as 'bare minimum' and 'not for production'
-# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_FLEXFILELAYOUT=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_PNFS_OBJLAYOUT=m
@@ -5573,7 +5572,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 CONFIG_FUNCTION_TRACER=y
 CONFIG_STACK_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-# CONFIG_HIST_TRIGGERS is not set
+CONFIG_HIST_TRIGGERS=y
 
 CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENT=y
diff --git a/kernel.spec b/kernel.spec
index fc6027578..8256b8085 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2154,6 +2154,11 @@ fi
 #
 #
 %changelog
+* Mon Nov 07 2016 Laura Abbott <labbott@redhat.com>
+- Enable CONFIG_EXT4_ENCRYPTION (rhbz 1389509)
+- Enable CONFIG_NFSD_FLEXFILELAYOUT
+- Enable CONFIG_HIST_TRIGGERS (rhbz 1390783)
+
 * Mon Nov  7 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Minor ARM config updates