diff --git a/ChangeLog b/ChangeLog
index a4de220d2..7ea87c83f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-05  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSString.m (-paragraphRangeForRange:,
+	-getParagraphStart:...): Basic implementation of these methods.
+
 2009-01-05  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSRunLoop.m: check for performers in thread even if there are
diff --git a/Source/NSString.m b/Source/NSString.m
index 20d9ced66..7ec9f2b08 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -2361,6 +2361,10 @@ handle_printf_atsign (FILE *stream,
                   forRange: (NSRange)range
 {
   // FIXME
+  [self getLineStart: startPtr
+        end: parEndPtr
+        contentsEnd: contentsEndPtr
+        forRange: range];
 }
 
 // Changing Case
@@ -3234,7 +3238,14 @@ static NSFileManager *fm = nil;
 
 - (NSRange) paragraphRangeForRange: (NSRange)range
 {
-  return NSMakeRange(0, 0);     // FIXME
+  NSUInteger startIndex;
+  NSUInteger endIndex;
+
+  [self getParagraphStart: &startIndex
+        end: &endIndex
+        contentsEnd: NULL
+        forRange: range];
+  return NSMakeRange(startIndex, endIndex - startIndex);
 }
 
 - (NSString*) pathExtension