diff --git a/locale/Makefile b/locale/Makefile
index 7e9475b974..e4fbe290b1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1995, 1996 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
@@ -37,7 +37,7 @@ extra-objs	= $(localedef-modules:=.o) $(locale-modules:=.o) \
 localedef-modules	:= charmap locfile-lex locfile-parse locale-ctype \
 			   monetary messages collate numeric
 locale-modules		:= ctypedump
-lib-modules		:= hash xmalloc
+lib-modules		:= locfile-hash xmalloc
 
 
 GPERF = gperf
diff --git a/locale/hash.c b/locale/locfile-hash.c
similarity index 100%
rename from locale/hash.c
rename to locale/locfile-hash.c
diff --git a/posix/glob/ChangeLog b/posix/glob/ChangeLog
index ac27755ce6..1dd02efc03 100644
--- a/posix/glob/ChangeLog
+++ b/posix/glob/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 14 02:28:22 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (glob_in_dir): Cast result of opendir to __ptr_t,
+	and cast STREAM to DIR * before passing to readdir and closedir.
+
 Mon Dec 11 20:07:54 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* posix/glob.c [! STDC_HEADERS]: Declare getenv.