diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 127b2c98..e2942980 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -130,20 +130,13 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     # all of them need to fetch the source
     factory = BuildFactory()
 
-    # old
-    #factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk',
-    #                    workdir="wxWidgets", mode='copy'))
-    #factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk',
-    #                    workdir="Phoenix", mode='copy'))
-    
     # Do an incremental update, keeping prior build tree
     mode = 'incremental'
     method = None
     clean = ''
     
     # Since the wx build doesn't have good dependency checking on MSW, clean first.
-    # Generation of dependency files is turned off for universal builds, so clean on osx too.
-    if port in ['win32', 'win64', 'osx']:
+    if port in ['win32', 'win64']:
         clean = 'clean'  
         
     # Start from a clean build tree for the daily builds
@@ -162,7 +155,14 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     else:
         cmd = 'python -u build.py %s %s dox touch etg --nodoc sip build' % (pyVer, clean)
         if port == 'osx':
-            cmd += ' --mac_arch=i386,x86_64'
+            if buildType == 'buildOnly':
+                # Only build one arch for the normal builds, so dependency
+                # tracking will be turned on so we can have faster turn-around
+                # times for those builds.
+                cmd += ' --mac_arch=x86_64'
+            else:                
+                # Build both architectures for the distribution builders
+                cmd += ' --mac_arch=i386,x86_64'
         if port == 'msw':
             cmd += ' --cairo'
         if buildType == 'dist':