diff --git a/glibc-fedora-nscd-warnings.patch b/glibc-fedora-nscd-warnings.patch
new file mode 100644
index 0000000..6a77a24
--- /dev/null
+++ b/glibc-fedora-nscd-warnings.patch
@@ -0,0 +1,30 @@
+Fedora-specific warnings about using nscd with sssd, and that
+shared mappings don't show up in nscd -g statistics.
+
+diff --git a/nscd/nscd.conf b/nscd/nscd.conf
+index 3730835c50a349c4..b66faa3ca33b4b64 100644
+--- a/nscd/nscd.conf
++++ b/nscd/nscd.conf
+@@ -3,6 +3,9 @@
+ #
+ # An example Name Service Cache config file.  This file is needed by nscd.
+ #
++# WARNING: Running nscd with a secondary caching service like sssd may lead to
++#          unexpected behaviour, especially with how long entries are cached.
++#
+ # Legal entries are:
+ #
+ #	logfile			<file>
+@@ -22,7 +25,12 @@
+ #       suggested-size		<service> <prime number>
+ #	check-files		<service> <yes|no>
+ #	persistent		<service> <yes|no>
++#
+ #	shared			<service> <yes|no>
++#	NOTE: Setting 'shared' to a value of 'yes' will accelerate the lookup
++#	      with the help of the client, but these lookups will not be
++#	      counted as cache hits i.e. 'nscd -g' may show '0%'.
++#
+ #	max-db-size		<service> <number bytes>
+ #	auto-propagate		<service> <yes|no>
+ #
diff --git a/glibc.spec b/glibc.spec
index 96def0f..0eaa5ed 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -87,7 +87,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -158,6 +158,12 @@ Patch23: glibc-python3.patch
 Patch28: glibc-rh1615608.patch
 Patch30: glibc-warning-fix.patch
 
+# In progress upstream submission for nsswitch.conf changes:
+# https://www.sourceware.org/ml/libc-alpha/2019-03/msg00425.html
+# In progress upstream submission for nscd.conf changes:
+# https://www.sourceware.org/ml/libc-alpha/2019-03/msg00436.html
+Patch31: glibc-fedora-nscd-warnings.patch
+
 ##############################################################################
 # Continued list of core "glibc" package information:
 ##############################################################################
@@ -1890,6 +1896,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Thu Mar 07 2019 Carlos O'Donell <carlos@redhat.com> - 2.29.9000-8
+- Add warnings and notes to /etc/nsswitch.conf and /etc/nscd.conf.
+
 * Mon Mar 18 2019 DJ Delorie <dj@redhat.com> - 2.29.9000-7
 - Auto-sync with upstream branch master,
   commit 78919d3886c9543279ec755a701e279c62b44164.
@@ -1955,7 +1964,6 @@ fi
 - Break further lines before not after operators.
 - Add and move fall-through comments in system-specific code.
 
-
 * Fri Mar 1 2019 DJ Delorie <dj@redhat.com> - 2.29.9000-3
 - Add .gdb_index to debug information (rhbz#1680765)
 
diff --git a/nsswitch.conf b/nsswitch.conf
index b49a3b2..ba87550 100644
--- a/nsswitch.conf
+++ b/nsswitch.conf
@@ -24,6 +24,9 @@
 #
 # 'sssd' performs its own 'files'-based caching, so it should
 # generally come before 'files'.
+#
+# WARNING: Running nscd with a secondary caching service like sssd may lead to
+# 	   unexpected behaviour, especially with how long entries are cached.
 
 # To use 'db', install the nss_db package, and put the 'db' in front
 # of 'files' for entries you want to be looked up first in the