diff --git a/ChangeLog b/ChangeLog
index d13c99756b..79395dcc07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/programs/localedef.c (construct_output_path): Correct
+	computation of endp after asprintf.
+	* locale/programs/locfile.c (write_locale_data): Don't add extra
+	slash in filename.
+
 2000-09-05  Andreas Jaeger  <aj@suse.de>
 
 	* scripts/config.guess: New upstream version.
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 719cfd3bb7..0a60d5c209 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -374,7 +374,7 @@ construct_output_path (char *path)
 		      output_prefix ?: "", LOCALEDIR,
 		      (int) (startp - path), path, normal, endp, '\0');
 
-      endp = result + n;
+      endp = result + n - 1;
     }
   else
     {