diff --git a/ar.c b/ar.c
index 27dfadd..a43cc1d 100644
--- a/ar.c
+++ b/ar.c
@@ -158,12 +158,12 @@
 			readSize = copySize;
 		writeSize = fullRead(srcFd, buffer, readSize);
 		if (writeSize <= 0) {
-			errorMsg(io_error, "copySubFile :", strerror(errno));
+			errorMsg(io_error, "copySubFile", strerror(errno));
 			return (FALSE);
 		}
 		doneSize = fullWrite(dstFd, buffer, writeSize);
 		if (doneSize <= 0) {
-			errorMsg(io_error, "copySubFile :", strerror(errno));
+			errorMsg(io_error, "copySubFile", strerror(errno));
 			return (FALSE);
 		}
 		copySize -= doneSize;
@@ -220,7 +220,7 @@
 		return (FALSE);
 	}
         if (fullRead(arFd, arVersion, 8) <= 0) {
-                errorMsg( "ar: Unexpected EOF in archive\n");
+                errorMsg( "Unexpected EOF in archive\n");
                 return (FALSE);
         }
         if (strncmp(arVersion,"!<arch>",7) != 0) {
