diff --git a/ChangeLog b/ChangeLog
index e6cae147d1..7e6c96a5af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* version.h (VERSION): Bump to 2.2.1.
 
 	* sysdeps/unix/sysv/linux/mips/Dist: Remove sys/acct.h.
+	* sysdeps/alpha/Dist: Add alphaev6/stxncpy.S and alphaev6/stxcpy.S.
+	* sysdeps/unix/sysv/aix/Dist: Add uitrunc.c, savef.S, and restf.S.
+	* dlfcn/Makefile (distribute): Add errmsg1mod.c.
+	* Makefile (distribute): Add include/libc-internal.h.
+	* libio/Makefile (distribute): Avoid overwriting.
 
 	* iconvdata/ibm937.c (BODY to IBM937): Correct several mistakes in
 	buffer and table handling.
diff --git a/Makefile b/Makefile
index 0160bba819..082e41bf64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000, 2001 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
@@ -259,7 +259,7 @@ distribute  :=	README README.libm INSTALL FAQ FAQ.in NOTES NEWS BUGS	\
 		config-name.in Makefile.in sysdep.h set-hooks.h		\
 		libc-symbols.h version.h shlib-versions rpm/Makefile	\
 		rpm/template rpm/rpmrc glibcbug.in abi-tags stub-tag.h	\
-		test-skeleton.c include/des.h		 		\
+		test-skeleton.c include/des.h include/libc-internal.h	\
 		include/shlib-compat.h Versions.def			\
 		INTERFACE CONFORMANCE NAMESPACE				\
 		$(addprefix scripts/,					\
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 3898880f00..1bcce2fd1b 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1995-1999, 2000, 2001 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
@@ -21,7 +21,7 @@ headers		:= bits/dlfcn.h dlfcn.h
 extra-libs	:= libdl
 libdl-routines	:= dlopen dlclose dlsym dlvsym dlerror dladdr eval
 distribute	:= dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \
-		   defaultmod1.c defaultmod2.c
+		   defaultmod1.c defaultmod2.c errmsg1mod.c
 
 extra-libs-others := libdl
 
diff --git a/libio/Makefile b/libio/Makefile
index c8e047649c..e6a9bb7ac2 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
+# Copyright (C) 1995,96,97,98,99,2000, 2001 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
@@ -50,7 +50,6 @@ routines	:=							      \
 tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst_wprintf2 tst-widetext test-fmemopen
 test-srcs = test-freopen
-distribute = test-freopen.sh
 
 all: # Make this the default target; it will be defined in Rules.
 
@@ -94,7 +93,7 @@ shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops	\
 		       oldiofgetpos oldiofgetpos64 oldiofsetpos		\
 		       oldiofsetpos64
 
-distribute := iolibio.h libioP.h strfile.h Banner
+distribute := iolibio.h libioP.h strfile.h Banner test-freopen.sh
 
 include ../Rules
 
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
index 034f0b03d2..7cf49111e4 100644
--- a/sysdeps/alpha/Dist
+++ b/sysdeps/alpha/Dist
@@ -7,3 +7,5 @@ _mcount.S
 stxcpy.S
 stxncpy.S
 fpu/fenv_libc.h
+alphaev6/stxncpy.S
+alphaev6/stxcpy.S
diff --git a/sysdeps/unix/sysv/aix/Dist b/sysdeps/unix/sysv/aix/Dist
index 9db1d7446d..bce7330830 100644
--- a/sysdeps/unix/sysv/aix/Dist
+++ b/sysdeps/unix/sysv/aix/Dist
@@ -4,3 +4,6 @@ dl-close.c
 kernel_proto.h
 bits/utmpx.h
 gnu/lib-names.h
+uitrunc.c
+savef.S
+restf.S