diff --git a/autobuild.xml b/autobuild.xml
index 955e5134a0..67542e259a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -22,18 +22,6 @@
             <key>name</key>
             <string>windows</string>
           </map>
-          <key>darwin</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>4c3728f376711663c22d32b6d71689df</string>
-              <key>url</key>
-              <string>http://downloads.phoenixviewer.com/slplugin_x86-4.7.10.51243-darwin-201610300350-r5.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
         </map>
       </map>
       <key>ndPhysicsStub</key>
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 7c9c9df297..025347502d 100755
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -145,10 +145,9 @@ ARGUMENTS=[
          default=None),
     dict(name='versionfile',
          description="""The name of a file containing the full version number."""),
-    # <FS:Ansariel> Don't pass the bundle ID so we sign the Mac DMG file with the developer certificate
-    #dict(name='bundleid',
-    #     description="""The Mac OS X Bundle identifier.""",
-    #     default="com.secondlife.indra.viewer"),
+    dict(name='bundleid',
+         description="""The Mac OS X Bundle identifier.""",
+         default="com.secondlife.indra.viewer"),
     dict(name='signature',
          description="""This specifies an identity to sign the viewer with, if any.
         If no value is supplied, the default signature will be used, if any. Currently
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index fab798d321..d0157b9794 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -344,8 +344,14 @@ if [ \( $WANTS_CLEAN -eq $TRUE \) -a \( $WANTS_BUILD -eq $FALSE \) ] ; then
     pushd ..
 
     if [ $PLATFORM == "darwin" ] ; then
-        rm -rf build-darwin-i386/*
-        mkdir -p build-darwin-i386/logs
+        if [ "${AUTOBUILD_ADDRSIZE}" == "64" ]
+        then
+           rm -rf build-darwin-x86_64/*
+           mkdir -p build-darwin-x86_64/logs
+        else
+           rm -rf build-darwin-i386/*
+           mkdir -p build-darwin-i386/logs
+        fi
 
     elif [ $PLATFORM == "win32" ] ; then
         rm -rf build-vc120-${AUTOBUILD_ADDRSIZE}