diff --git a/ChangeLog b/ChangeLog
index e654e14d06..06133d7d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-02-16  Ulrich Drepper  <drepper@redhat.com>
 
+	* locale/programs/charmap.c (charmap_read): Find charmap also in
+	the standard directory.
+
 	* sysdeps/unix/sysv/linux/powerpc/mmap64.c: Correct prototype for
 	__syscall_mmap2.
 
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index b4bce4fe34..0c54c78ad4 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -99,6 +99,15 @@ charmap_read (const char *filename)
 			}
 		    }
 		}
+
+	      if (cmfile == NULL)
+		{
+		  /* Try the default directory.  */
+		  char path[sizeof (CHARMAP_PATH) + strlen (filename) + 1];
+
+		  stpcpy (stpcpy (stpcpy (path, CHARMAP_PATH), "/"), filename);
+		  cmfile = lr_open (path, charmap_hash);
+		}
 	    }
 	}