diff --git a/ChangeLog b/ChangeLog
index f98285fbf7..6575576e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-01-26  Andreas Jaeger  <aj@suse.de>
+
+	* Make-dist (+sysdep-tscrs): Add libm-test-ulps.
+
+2000-01-26  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/Makefile (distribute): Remove nonexisting files.
+	* sysdeps/powerpc/Dist: Move FPU specific files to...
+	* sysdeps/powerpc/fpu/Dist: ...here.  New file.
+	* nss/Makefile: Distribute files for new libdb interface.
+	* math/Makefile (distribute): Add README.libm-test.
+	Patch by Andreas Jaeger.
+
 2000-01-26  David McCann  <david.mccann@alcatel.at>
 
 	* libio/libioP.h [!_G_HAVE_MMAP]: Define ALLOC_WBUF.
diff --git a/Make-dist b/Make-dist
index 376911c4ce..d59509ab15 100644
--- a/Make-dist
+++ b/Make-dist
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -182,7 +182,8 @@ foo:=$(shell echo +sysdep-distfiles='$(+sysdep-distfiles)'>&2)
 foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2)
 
 +sysdep-tsrcs := $(wildcard $(foreach file,Makefile Implies syscalls.list\
-				           configure configure.in Versions,\
+				           configure configure.in Versions\
+					   libm-test-ulps,\
 				      $(addsuffix /$(file),$(sysdep_dirs)))) \
 		 $(+sysdep-dist)
 
diff --git a/locale/Makefile b/locale/Makefile
index 9a34847e99..71bd457dce 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 1995-1999, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -30,8 +30,7 @@ distribute	= localeinfo.h categories.def iso-639.def iso-3166.def \
 			      $(lib-modules:=.c) config.h simple-hash.h \
 			      charmap-kw.gperf charmap-kw.h locfile-token.h \
 			      locfile-kw.gperf locfile-kw.h linereader.h \
-			      locales.h locfile.h stringtrans.h charmap.h \
-			      repertoire.h)
+			      locfile.h charmap.h repertoire.h)
 routines	= setlocale findlocale loadlocale localeconv nl_langinfo \
 		  mb_cur_max codeset_name \
 		  newlocale duplocale freelocale
diff --git a/math/Makefile b/math/Makefile
index 0480ea99b0..56a17a8fae 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -131,7 +131,7 @@ LDLIBS-atest-exp = math/libm
 LDLIBS-atest-sincos = math/libm
 LDLIBS-atest-exp2 = math/libm
 
-distribute += libm-test.inc gen-libm-test.pl
+distribute += libm-test.inc gen-libm-test.pl README.libm-test
 
 
 # The -lieee module sets the _LIB_VERSION_ switch to IEEE mode
diff --git a/nss/Makefile b/nss/Makefile
index ea32449bb8..f6ebe2c207 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -69,7 +69,7 @@ libnss_db-routines	:= $(addprefix db-,$(filter-out hosts network key,\
 			   db-open
 generated		+= $(filter-out db-alias.c db-netgrp.c, \
 					$(addsuffix .c,$(libnss_db-routines)))
-distribute		+= db-XXX.c nss_db.h dummy-db.h
+distribute		+= $(addprefix nss_db/, db-XXX.c nss_db.h dummy-db.h)
 
 
 $(objpfx)makedb: $(libdl) $(objpfx)db-open.o
diff --git a/sysdeps/powerpc/Dist b/sysdeps/powerpc/Dist
index 0c7ed9635b..4513e6c604 100644
--- a/sysdeps/powerpc/Dist
+++ b/sysdeps/powerpc/Dist
@@ -1,7 +1,4 @@
 dl-machine.c
 dl-start.S
-fenv_const.c
-fenv_libc.h
 ppc-mcount.S
 fe_nomask.c
-t_sqrt.c
diff --git a/sysdeps/powerpc/fpu/Dist b/sysdeps/powerpc/fpu/Dist
new file mode 100644
index 0000000000..ce00e3ab70
--- /dev/null
+++ b/sysdeps/powerpc/fpu/Dist
@@ -0,0 +1,3 @@
+fenv_const.c
+fenv_libc.h
+t_sqrt.c