diff --git a/ChangeLog b/ChangeLog
index 27fb4dc6c..9e7e3ef5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-02 Roland Schwingel <roland.schwingel@onevision.de>
+
+	* Source/NSString.m: ([stringByAbbreviatingWithTildeInPath]) fix bug
+	appending last path component.
+	([localizedNameOfStringEncoding:]) fix load of locliisation bundle.
+
 2004-02-02 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Headers/Foundation/NSPropertyList.h:
diff --git a/Source/NSString.m b/Source/NSString.m
index 506358b08..cca06505f 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -2856,7 +2856,7 @@ handle_printf_atsign (FILE *stream,
       Until we have it, just make sure that bundle
       is initialized.
 */
-  ourbundle = [NSBundle gnustepBundle];
+  ourbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
 
   ourname = GetEncodingName(encoding);
   return [ourbundle localizedStringForKey: ourname
@@ -3517,7 +3517,7 @@ handle_printf_atsign (FILE *stream,
       return @"~";
     }
   return [@"~" stringByAppendingPathComponent:
-    [self substringFromIndex: [homedir length] + 1]];
+    [self substringFromIndex: [homedir length]]];
 }
 
 /**