diff --git a/macosx/AboutWindowController.m b/macosx/AboutWindowController.m
index 8479434d3..7d606b5f8 100644
--- a/macosx/AboutWindowController.m
+++ b/macosx/AboutWindowController.m
@@ -40,6 +40,8 @@ AboutWindowController * fAboutBoxInstance = nil;
     [fVersionField setStringValue: [NSString stringWithFormat: @"%@ (%@)",
         [info objectForKey: @"CFBundleShortVersionString"], [info objectForKey: (NSString *)kCFBundleVersionKey]]];
     
+    #warning get copyright info from file
+    
     [[fTextView textStorage] setAttributedString: [[[NSAttributedString alloc] initWithPath:
             [[NSBundle mainBundle] pathForResource: @"Credits" ofType: @"rtf"] documentAttributes: nil] autorelease]];
 
diff --git a/macosx/IPCController.m b/macosx/IPCController.m
index e87f9d363..2f7817f78 100644
--- a/macosx/IPCController.m
+++ b/macosx/IPCController.m
@@ -273,7 +273,7 @@ msg_default  ( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg );
     _controller = controller;
     _buf        = [[NSMutableData alloc] init];
 
-    buf = ipc_mkvers( &size, "Transmission MacOS X " LONG_VERSION_STRING );
+    buf = ipc_mkvers( &size, "Transmission Mac OS X " LONG_VERSION_STRING );
     if( NULL == _ipc || nil == _buf || NULL == buf ||
         ![self sendresp: buf size: size] )
     {
diff --git a/version.sh b/version.sh
index abd4c221e..518fdbf86 100755
--- a/version.sh
+++ b/version.sh
@@ -48,8 +48,8 @@ cat > libtransmission/version.h.new << EOF
 #define VERSION_MAINTENANCE  "$MAINT"
 #define VERSION_REVISION     "$REV"
 #define VERSION_BETA         "$BETA"
-#define SHORT_VERSION_STRING "$MAJOR.$MINOR$MAINT$BETA"
-#define LONG_VERSION_STRING  "$MAJOR.$MINOR$MAINT$BETA (r$REV)"
+#define SHORT_VERSION_STRING "$STRING"
+#define LONG_VERSION_STRING  "$STRING ($REV)"
 EOF
 replace_if_differs libtransmission/version.h.new libtransmission/version.h