diff --git a/checkin_notes b/checkin_notes
index b843b75b1f..0d5232110b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4061,7 +4061,8 @@ David  26 Apr 2007
         log_flags.C,h
 
 Charlie 27 Apr 2007
-    - Mac: Update build instructions.
+    - Mac: Update build instructions.  Mark old mac_build.php page as 
+        deprecated and add link to new wiki page.
 
     doc/
         mac_build.php
diff --git a/doc/mac_build.php b/doc/mac_build.php
index 21f33f18cb..3751f3be8c 100644
--- a/doc/mac_build.php
+++ b/doc/mac_build.php
@@ -3,6 +3,12 @@ require_once("docutil.php");
 page_head("Building BOINC Clients and Applications on Macintosh OS X");
 
 echo "
+<b>This page is deprecated. Please see the new wiki page at </b>
+";
+show_link("http://boinc.berkeley.edu/trac/wiki/MacBuild"); 
+echo "
+<p>
+
 This document applies to BOINC version 5.9.2 and later.
 It has instructions for building BOINC for Macintosh OS X,
 plus information for building science project applications to run under
diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf
index fa007e6770..3827ab5cde 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -1,8 +1,8 @@
 {\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fmodern\fcharset77 Courier;
 \f3\fswiss\fcharset77 Helvetica-Oblique;\f4\fnil\fcharset77 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;\red0\green0\blue239;\red78\green0\blue124;}
-\margl1440\margr1440\vieww13540\viewh11860\viewkind0
+{\colortbl;\red255\green255\blue255;\red0\green0\blue239;}
+\margl1440\margr1440\vieww14740\viewh11840\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
 
 \f0\b\fs28 \cf0 Building BOINC Clients and Applications on Macintosh OSX\
@@ -62,8 +62,9 @@ Elsewhere on Apple's web site is the warning:\
 \cf0 \
 Be sure to follow the directions in this document to ensure that these requirements are met.\
 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 
-\f0\b Building BOINC now requires XCode Tools version 2.4.1 or later.
+\f0\b \cf0 Building BOINC now requires XCode Tools version 2.4.1 or later.
 \f1\b0   (Version 2.3 may work; this has not been tested.)\
 \
 Source files are now archived using Subversion.  You can download svnX, a free GUI application for running Subversion from either\
@@ -72,8 +73,7 @@ or\
 	{\field{\*\fldinst{HYPERLINK "http://www.lachoseinteractive.net/en/community/subversion/svnx/"}}{\fldrslt http://www.lachoseinteractive.net/en/community/subversion/svnx/}}\
 \
 You also need to install Subversion itself.  One place to get it is:\
-	{\field{\*\fldinst{HYPERLINK "http://www.codingmonkeys.de/mbo/"}}{\fldrslt http://www.codingmonkeys.de/mbo/}}
-\
+	{\field{\*\fldinst{HYPERLINK "http://www.codingmonkeys.de/mbo/"}}{\fldrslt http://www.codingmonkeys.de/mbo/}}\
 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
@@ -171,14 +171,14 @@ Building BOINC and the library packages on which it depends requires OS 10.4.4 a
 \
 Important: do not change the names of any of these 3 directories.\
 \
-[3] Get the BOINC source tree from CVS, and put it in the same BOINC_dev folder.  To do this, type the following in Terminal:\
+[3] Get the BOINC source tree from Subversion, and put it in the same BOINC_dev folder.  To do this, type the following in Terminal:\
 \
 \pard\pardeftab720\ql\qnatural
 
 \f2\fs26 \cf0 cd \{path\}/BOINC_dev/
 \f1\fs24 \
 
-\f2\fs26 cvs -d :pserver:anonymous:@alien.ssl.berkeley.edu:/home/cvs/cvsroot checkout boinc
+\f2\fs26 svn co http://boinc.berkeley.edu/svn/trunk/boinc
 \f1\fs24   \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
@@ -186,8 +186,8 @@ Important: do not change the names of any of these 3 directories.\
 \
 The command above retrieves the source code from the HEAD or development branch of the CVS repository.  For more information on getting the BOINC source code, see:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/source_code.php"}}{\fldrslt 
-\f2\fs26 \cf0 http://boinc.berkeley.edu/source_code.php}}\
+{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SourceCode"}}{\fldrslt 
+\f2\fs26 \cf0 http://boinc.berkeley.edu/trac/wiki/SourceCode}}\
 \
 [4] Run the script to build the curl, jpeg and wxMac libraries as follows:\
 \
@@ -302,7 +302,8 @@ source \{path\}/BOINC_dev/boinc/mac_installer/release_GridRepublic.sh 5 5 4\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 Version 5.5.4 of BOINC Manager for the Macintosh introduced new, stricter security measures.  For details, please see the file boinc/mac_installer/Readme.rtf and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}}  \
+\cf0 Version 5.5.4 of BOINC Manager for the Macintosh introduced new, stricter security measures.  For details, please see the file boinc/mac_installer/Readme.rtf and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/sandbox.php"}}{\fldrslt http://boinc.berkeley.edu/sandbox.php}} and {\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/SandboxUser"}}{\fldrslt 
+\f2 http://boinc.berkeley.edu/trac/wiki/SandboxUser}}\
 \
 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\tx10560\tx11520\tx12480\tx13440\tx14400\tx15360\tx16320\tx17280\tx18240\tx19200\tx20160\tx21120\tx22080\tx23040\tx24000\tx24960\tx25920\tx26880\tx27840\tx28800\tx29760\tx30720\tx31680\tx32640\tx33600\tx34560\tx35520\tx36480\tx37440\tx38400\tx39360\tx40320\tx41280\tx42240\tx43200\tx44160\tx45120\tx46080\tx47040\tx48000\tx48960\tx49920\tx50880\tx51840\tx52800\tx53760\tx54720\tx55680\tx56640\tx57600\tx58560\tx59520\tx60480\tx61440\tx62400\tx63360\tx64320\tx65280\tx66240\tx67200\tx68160\tx69120\tx70080\tx71040\tx72000\tx72960\tx73920\tx74880\tx75840\tx76800\tx77760\tx78720\tx79680\tx80640\tx81600\tx82560\tx83520\tx84480\tx85440\tx86400\tx87360\tx88320\tx89280\tx90240\tx91200\tx92160\tx93120\tx94080\tx95040\tx96000\ql\qnatural\pardirnatural
 \cf0 \CocoaLigature0 The GDB debugger can't attach to applications which are running as a diferent user or group so it ignores the S_ISUID and S_ISGID permisison bits when launching an application.  To work around this, BOINC does not use the special boinc_master or boinc_project users or groups when run from XCode.  \
@@ -358,11 +359,11 @@ So it is important to make a native Intel application available as soon as possi
 \
 It is very easy to add a new platform to your server with the xadd utility.  For directions on how to do this, see these web pages:\
 \pard\pardeftab720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/platform.php"}}{\fldrslt 
-\f2\fs26 \cf3 \ul \ulc3 http://boinc.berkeley.edu/platform.php}}
+{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/BoincPlatforms"}}{\fldrslt 
+\f2 \cf0 http://boinc.berkeley.edu/trac/wiki/BoincPlatforms}}
 \f2\fs26 \
-\pard\pardeftab720\ql\qnatural
-{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/tool_xadd.php"}}{\fldrslt \cf2 \ul http://boinc.berkeley.edu/tool_xadd.php}}
+{\field{\*\fldinst{HYPERLINK "http://boinc.berkeley.edu/trac/wiki/XaddTool"}}{\fldrslt 
+\fs24 http://boinc.berkeley.edu/trac/wiki/XaddTool}}
 \f1\fs24 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \