diff --git a/Orange/OrangeCanvas/main.py b/Orange/OrangeCanvas/main.py
index 6922cccc3..8a3a3182d 100644
--- a/Orange/OrangeCanvas/main.py
+++ b/Orange/OrangeCanvas/main.py
@@ -45,18 +45,18 @@ def running_in_ipython():
 
 
 def fix_osx_private_font():
-    """Temporary fixes for QTBUG-32789 an QTBUG-40833"""
-    from PyQt4.QtCore import QSysInfo, QT_VERSION
+    # Fix fonts on Os X (QTBUG 47206, 40833, 32789)
     if sys.platform == "darwin":
+        import platform
         try:
-            if QSysInfo.MacintoshVersion > 11 and \
-                    QT_VERSION < 0x40807:
-                # Fix for Yosemite
+            version = platform.mac_ver()[0]
+            version = float(version[:version.rfind(".")])
+            if version >= 10.11:  # El Capitan
+                QFont.insertSubstitution(".SF NS Text", "Helvetica Neue")
+            elif version >= 10.10:  # Yosemite
                 QFont.insertSubstitution(".Helvetica Neue DeskInterface",
                                          "Helvetica Neue")
-            if QSysInfo.MacintoshVersion > QSysInfo.MV_10_8 and \
-                    QT_VERSION < 0x40806:
-                # Fix for Mavericks
+            elif version >= 10.9:
                 QFont.insertSubstitution(".Lucida Grande UI", "Lucida Grande")
         except AttributeError:
             pass
diff --git a/install-scripts/mac/build-osx-app.sh b/install-scripts/mac/build-osx-app.sh
index 0a8fe6854..fa88a1854 100755
--- a/install-scripts/mac/build-osx-app.sh
+++ b/install-scripts/mac/build-osx-app.sh
@@ -159,19 +159,73 @@ EOF
 chmod +x "$TEMPLATE"/Contents/MacOS/Orange
 
 
+VERSION=$(python setup.py --version)
+cat <<EOF > "$TEMPLATE"/Contents/Info.plist
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>CFBundleExecutable</key>
+	<string>Orange</string>
+	<key>CFBundleIconFile</key>
+	<string>orange.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>si.biolab.Orange</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Orange</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Orange, component-based data mining software</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>Orng</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${VERSION}</string>
+	<key>CFBundleVersion</key>
+	<string>${VERSION}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ows</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Orange Canvas Schema</string>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>OWSf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>schema.icns</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSIsAppleDefaultForType</key>
+			<true/>
+		</dict>
+	</array>
+</dict>
+</plist>
+EOF
 echo "Installing add ons"
 echo "=================="
 
 # Install as eggs. The application's Add-ons dialog has problem with
 # upgrading flat installs.
-"$PIP" install --egg hg+https://bitbucket.org/biolab/orange-bioinformatics
+"$PIP" install --egg orange-bioinformatics
+"$PIP" install --egg orange-network
 "$PIP" install --egg hg+https://bitbucket.org/biolab/orange-text
-"$PIP" install --egg Orange-Network
+
 
 echo "Installing optional dependencies"
 echo "================================"
 "$PIP" install slumber
-"$PIP" install --allow-external PIL --allow-unverified PIL PIL
 
 
 if [[ ! $INPLACE ]]; then
diff --git a/install-scripts/mac/bundle-lite/Orange.app/Contents/Info.plist b/install-scripts/mac/bundle-lite/Orange.app/Contents/Info.plist
index 6ee7637d8..5eeede666 100644
--- a/install-scripts/mac/bundle-lite/Orange.app/Contents/Info.plist
+++ b/install-scripts/mac/bundle-lite/Orange.app/Contents/Info.plist
@@ -2,12 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
 	<key>CFBundleExecutable</key>
 	<string>Orange</string>
 	<key>CFBundleIconFile</key>
 	<string>orange.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>si.ailab.Orange</string>
+	<string>si.biolab.Orange</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>