diff --git a/ChangeLog b/ChangeLog
index a8169b0542..3d564d3ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* nss/Makefile (libnss_db-dbs): Remove stry backslash.
+	Patch by Zack Weinberg <zack@wolery.cumb.org>.
+
 2000-04-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* manual/examples/subopt.c (mount_opts): Add missing terminating
diff --git a/manual/examples/subopt.c b/manual/examples/subopt.c
index 8c04a57e02..287fe8c495 100644
--- a/manual/examples/subopt.c
+++ b/manual/examples/subopt.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 int do_all;
 const char *type;
diff --git a/nss/Makefile b/nss/Makefile
index 5e94c347f4..18538d0b24 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -65,7 +65,7 @@ libnss_files-routines	:= $(addprefix files-,$(databases))
 distribute		+= files-XXX.c files-parse.c
 
 libnss_db-dbs		:= $(addprefix db-,$(filter-out hosts network key,\
-							$(databases))) \
+							$(databases)))
 libnss_db-routines	:= $(libnss_db-dbs) db-open
 generated		+= $(filter-out db-alias.c db-netgrp.c, \
 					$(addsuffix .c,$(libnss_db-dbs)))