diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bd8cec917b..c375025038 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20	Bharath Suri <bharath.s.jois@gmail.com>
+
+	* libcsupport/src/_rename_r.c: Avoid overwriting of errno by
+	_rename_r to invalid values.
+
 2010-05-18	Chris Johns <chrisj@rtems.org>
 
 	* libblock/src/diskdevs.c, libblock/include/rtems/blkdev.h,
diff --git a/cpukit/libcsupport/src/_rename_r.c b/cpukit/libcsupport/src/_rename_r.c
index d12355c8d0..f1e73fc18d 100644
--- a/cpukit/libcsupport/src/_rename_r.c
+++ b/cpukit/libcsupport/src/_rename_r.c
@@ -70,7 +70,7 @@ int _rename_r(
   if ( result != 0 ) {
     if ( free_old_parentloc )
       rtems_filesystem_freenode( &old_parent_loc );
-    rtems_set_errno_and_return_minus_one( result );
+    return -1;
   }
   
   /*
@@ -92,7 +92,7 @@ int _rename_r(
     if ( free_old_parentloc )
       rtems_filesystem_freenode( &old_parent_loc );
     rtems_filesystem_freenode( &old_loc );
-    rtems_set_errno_and_return_minus_one( result );
+    return -1;
   }
 
   /*