Index: install-scripts/install3.nsi
===================================================================
--- install-scripts/install3.nsi	(revision 11086)
+++ install-scripts/install3.nsi	(revision 11533)
@@ -198,6 +198,6 @@
 
 	SetOutPath $INSTDIR\OrangeCanvas
-	CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0
-	CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0
+	CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "-m Orange.OrangeCanvas.main" $INSTDIR\OrangeCanvas\icons\orange.ico 0
+	CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "-m Orange.OrangeCanvas.main" $INSTDIR\OrangeCanvas\icons\orange.ico 0
 
 	WriteRegStr SHELL_CONTEXT "SOFTWARE\Python\PythonCore\${NPYVER}\PythonPath\Orange" "" "$INSTDIR\orng"
@@ -207,5 +207,5 @@
 	WriteRegStr HKEY_CLASSES_ROOT ".ows" "" "OrangeCanvas"
 	WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\DefaultIcon" "" "$INSTDIR\OrangeCanvas\icons\OrangeOWS.ico"
-	WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe $INSTDIR\OrangeCanvas\orngCanvas.pyw "%1"'
+	WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe -m Orange.OrangeCanvas.main "%1"'
 
 	WriteUninstaller "$INSTDIR\uninst.exe"
Index: install-scripts/mac/bundle-build-hg.sh
===================================================================
--- install-scripts/mac/bundle-build-hg.sh	(revision 11528)
+++ install-scripts/mac/bundle-build-hg.sh	(revision 11533)
@@ -22,5 +22,4 @@
 TEMPLATE_VERSION=`curl --silent http://orange.biolab.si/download/bundle-templates/CURRENT.txt`
 curl --silent http://orange.biolab.si/download/bundle-templates/Orange-template-${TEMPLATE_VERSION}.tar.gz | tar -xz -C $WORK_DIR
-#svn export --non-interactive http://orange.biolab.si/svn/orange/externals/trunk/install-scripts/mac/bundle/ $TMP_BUNDLE_DIR
 
 # Make repos dir if it does not yet exist
@@ -28,4 +27,21 @@
 	mkdir $REPOS_DIR
 fi
+
+# Create bundle startup script
+cat <<-'EOF' > ${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/Orange
+	#!/bin/bash
+
+	source `dirname "$0"`/ENV
+
+	# LaunchServices passes the Carbon process identifier to the application with
+	# -psn parameter - we do not want it
+	if [[ $1 == -psn_* ]]; then
+	    shift 1
+	fi
+
+	exec -a "$0" "$PYTHONEXECUTABLE" -m Orange.OrangeCanvas.main "$@"
+EOF
+
+chmod +x ${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/Orange
 
 # Python interpreter in the bundle
Index: setup.py
===================================================================
--- setup.py	(revision 11531)
+++ setup.py	(revision 11533)
@@ -751,7 +751,7 @@
 
 ENTRY_POINTS = {
-#    'gui_scripts': (
-#            'orange-canvas = Orange.OrangeCanvas.main:main',
-#    ),
+    'gui_scripts': (
+            'orange-canvas = Orange.OrangeCanvas.main:main',
+    ),
     'orange.canvas.help': (
             'intersphinx = Orange.OrangeWidgets:intersphinx',
@@ -786,7 +786,4 @@
         cmdclass = cmdclass,
         ext_modules = ext_modules,
-        scripts = (
-            'bin/orange-canvas',
-        ),
     )