diff --git a/gfx/thebes/nsCoreAnimationSupport.mm b/gfx/thebes/nsCoreAnimationSupport.mm
index 4d48d09761d8..3f85894719b4 100644
--- a/gfx/thebes/nsCoreAnimationSupport.mm
+++ b/gfx/thebes/nsCoreAnimationSupport.mm
@@ -451,9 +451,8 @@ nsresult nsCARenderer::SetupRenderer(void *aCALayer, int aWidth, int aHeight) {
   CARenderer* caRenderer = nsnull;
 
   CGLPixelFormatAttribute attributes[] = {
-    kCGLPFANoRecovery,
     kCGLPFAAccelerated,
-    kCGLPFAPBuffer,
+    kCGLPFAAllowOfflineRenderers,
     kCGLPFADepthSize, (CGLPixelFormatAttribute)24,
     (CGLPixelFormatAttribute)0
   };
diff --git a/ipc/app/macbuild/Contents/Info.plist.in b/ipc/app/macbuild/Contents/Info.plist.in
index 6af14a399f33..39fbd19d60d6 100644
--- a/ipc/app/macbuild/Contents/Info.plist.in
+++ b/ipc/app/macbuild/Contents/Info.plist.in
@@ -27,5 +27,7 @@
 	</dict>
 	<key>LSUIElement</key>
 	<string>1</string>
+  <key>NSSupportsAutomaticGraphicsSwitching</key>
+  <true/>
 </dict>
 </plist>