diff --git a/ChangeLog b/ChangeLog
index 47faa520be..48d285f49c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-15  Alexey Neyman  <stilor@att.net>
+
+	[BZ #21088]
+	* nss/nsswitch.c (nscd_init_cb, is_nscd): Make the #if check
+	around definitions match those around use.
+
 2017-03-15  Alexey Neyman  <stilor@att.net>
 
 	* configure.ac: Avoid empty subexpression in grep.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 0a65f6ad0c..8f31658523 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -94,7 +94,7 @@ static name_database *service_table;
 static name_database_entry *defconfig_entries;
 
 
-#ifdef USE_NSCD
+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
 /* Nonzero if this is the nscd process.  */
 static bool is_nscd;
 /* The callback passed to the init functions when nscd is used.  */