diff --git a/mac/make_local.sh b/mac/make_local.sh
index 32131dd4b..02245e87e 100755
--- a/mac/make_local.sh
+++ b/mac/make_local.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PYTHON=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6
+PYTHON=/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7
 
 if [ "x$debug" = "x" ]; then
     echo "cleaning up..."
diff --git a/mac/set-dmg-settings.scpt b/mac/set-dmg-settings.scpt
index 1d1fe4cd6..83a43e390 100644
Binary files a/mac/set-dmg-settings.scpt and b/mac/set-dmg-settings.scpt differ
diff --git a/mac/setup.py b/mac/setup.py
index 1cf60a9f2..69fdfb42b 100644
--- a/mac/setup.py
+++ b/mac/setup.py
@@ -28,11 +28,11 @@ class bdist_dmg(Command):
 	def run(self):
                 self.run_command('py2app')
                 os.system("\
-mkdir -p dist/Anki.app/Contents/Resources/include/python2.6")
+mkdir -p dist/Anki.app/Contents/Resources/include/python2.7")
                 os.system("\
-cp /Library/Frameworks/Python.framework/Versions/2.6/include/\
-python2.6/pyconfig.h dist/Anki.app/Contents/Resources/include/\
-python2.6/pyconfig.h")
+cp /Library/Frameworks/Python.framework/Versions/2.7/include/\
+python2.7/pyconfig.h dist/Anki.app/Contents/Resources/include/\
+python2.7/pyconfig.h")
                 os.system("\
 chmod a+x dist/Anki.app/Contents/Resources/audio/mplayer")
                 if 'debug' in os.environ:
@@ -61,7 +61,7 @@ PLIST = dict(
 	CFBundleLocalizations = ['en'],
         )
 OPTIONS = {
-	'argv_emulation': True,
+	'argv_emulation': False,
     'optimize': 0,
         'alias': 'debug' in os.environ and os.environ['debug'] == "2",
 	'plist': PLIST,