diff --git a/ChangeLog b/ChangeLog
index 49b3b8b2..d3b178be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* lib/nscd.c: Add missing newline to error message.
+	* lib/nscd.c: If nscd is installed but not in use, then running
+	`nscd -i` will exit(1). We shouldn't warn in this case since this
+	is not abnormal behavior.
+
 2012-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* man/.gitignore: Add generate_mans.deps
diff --git a/lib/nscd.c b/lib/nscd.c
index 227c2050..7adb58ff 100644
--- a/lib/nscd.c
+++ b/lib/nscd.c
@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
 		/* nscd is not installed, or it is installed but uses an
 		   interpreter that is missing.  Probably the former. */
 		return 0;
+	} else if (code == 1) {
+		/* nscd is installed, but it isn't active. */
+		return 0;
 	} else if (code != 0) {
-		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
+		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
 		                Prog, code);
 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
 		return -1;