diff --git a/mediachanger/castorrmc/h/serrno.h b/mediachanger/castorrmc/h/serrno.h
index d825aa2533cc1d531bf03e557dfb82140649e3fb..4e820062197f1592ffdc1ffde5a0f90ae3695e16 100644
--- a/mediachanger/castorrmc/h/serrno.h
+++ b/mediachanger/castorrmc/h/serrno.h
@@ -35,7 +35,7 @@
 #define EDNSBASEOFF     3000            /* DNS error base offset        */
 
 #define SENOERR         SEBASEOFF       /* No error                     */
-#define SENOSHOST       SEBASEOFF+1     /* Host unknown                 */
+#define SENOSHOST       SEBASEOFF+1     /* Host not known               */
 #define SENOSSERV       SEBASEOFF+2     /* Service unknown              */
 #define SENOTRFILE      SEBASEOFF+3     /* Not a remote file            */
 #define SETIMEDOUT      SEBASEOFF+4     /* Has timed out                */
diff --git a/mediachanger/castorrmc/h/serrno.man b/mediachanger/castorrmc/h/serrno.man
index f61b7e8e2ef9f823709713de96fbc93e9d61b7e6..26331057dc3cea7a2f8bbbcd7b9406e878120b86 100644
--- a/mediachanger/castorrmc/h/serrno.man
+++ b/mediachanger/castorrmc/h/serrno.man
@@ -81,7 +81,7 @@ The \fBserrno\fP variable is divided into common values and per package values,
 The following error values might be returned by any package:
 .TP 1.9i
 .B SENOSHOST
-(1001) Host unknown
+(1001) Host not known
 .TP
 .B SENOSSERV
 (1002) Service unknown
diff --git a/mediachanger/castorrmc/h/strerror_r_wrapper.h b/mediachanger/castorrmc/h/strerror_r_wrapper.h
index b0484cf925a30dfdb0c30e90f48750990ed423d1..12619a10e420871e28f7896be59255cdb8446536 100644
--- a/mediachanger/castorrmc/h/strerror_r_wrapper.h
+++ b/mediachanger/castorrmc/h/strerror_r_wrapper.h
@@ -56,6 +56,9 @@
  * @param errnum The error number.
  * @param buf The buffer.
  * @param buflen The length of the buffer.
+ * @return 0 on success and -1 on error.  If -1 is returned then errno is set
+ * to either EINVAL to indicate the error number is invalid, or to ERANGE to
+ * indicate the supplied error buffer is not large enough.
  */
 EXTERN_C int strerror_r_wrapper(int errnum, char *buf, size_t buflen);