diff --git a/ChangeLog b/ChangeLog
index 0d919fa1fd..12acbe8181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-12-21  Ulrich Drepper  <drepper@cygnus.com>
 
+	* nss/db-Makefile (shadow.db): Create file with correct protections.
+	Based on a patch by Joel Klecker <espy@debian.org>.
+
 	* inet/gethstbynm_r.c: Remove NEED__RES definition since we do this
 	anyway for digits_dots.c.
 	* nss/getXXbyYY.c: Initialize _res before using digits_dots.c
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index ad40e6235a..8acde7bddd 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,6 +1,18 @@
+1998-12-21  Ulrich Drepper  <drepper@cygnus.com>
+
+	* manager.c: Threads now send __pthread_sig_cancel on termination.
+	Change clone call and signal masks.
+	* thread.c (pthread_handle_sigrestart): Remove special code for
+	manager.
+	(pthread_handle_sigcancel): In manager thread call
+	__pthread_manager_sighandler.
+	* sysdeps/i386/pt-machine.h (__compare_and_swap): Add memory clobber.
+	* sysdeps/i386/i686/pt-machine.h: Likewise.
+	Patches by Xavier Leroy.
+
 1998-12-14  Ulrich Drepper  <drepper@cygnus.com>
 
-	* spinlock.c (__pthread_unlock): Don"t crash if called for an
+	* spinlock.c (__pthread_unlock): Don't crash if called for an
 	untaken mutex.  Reported by Ruslan V. Brushkoff <rus@Snif.Te.Net.UA>.
 
 	* Examples/ex6.c: Unbuffer stdout and reduce sleep time to reduce
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 47b17f5b6d..1a7785ad0f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de> 
+ 
+	* Makefile (test-input): Add hr_HR.ISO-8859-2. 
+	(test-input-data): New variable. 
+	(distribute): Use it. 
+	(do-collate-test): Use it. 
+	* hr_HR.in: New file. 
+ 
 1998-12-16  Ulrich Drepper  <drepper@cygnus.com>
 
 	* charmaps/IBM866: New file.
diff --git a/nss/db-Makefile b/nss/db-Makefile
index a0dad0fd6a..f281d4d0e0 100644
--- a/nss/db-Makefile
+++ b/nss/db-Makefile
@@ -111,8 +111,19 @@ $(VAR_DB)/shadow.db: /etc/shadow
 		 /^[ \t]*#/ { next } \
 		 { printf "0%u ", cnt++; print } \
 		 /^[^#]/ { printf ".%s ", $$1; print }' $^ | \
-	$(MAKEDB) -o $@ -
+	(umask 077 && $(MAKEDB) -o $@ -)
 	@echo "done."
+	@if chgrp shadow $@ 2>/dev/null; then \
+	  chmod g+r $@; \
+	else \
+	  chown 0; chgrp 0; chmod 600; \
+	  echo; \
+	  echo "Warning: The shadow password database $@"; \
+	  echo "has been set to be readable only by root.  You may want"; \
+	  echo "to make it readable by the \`shadow' group depending"; \
+	  echo "on your configuration."; \
+	  echo; \
+	fi
 
 $(VAR_DB)/netgroup.db: /etc/netgroup
 	@echo -n "$(patsubst %.db,%,$(@F))... "