diff --git a/Documentation/compiling/mac-osx.txt b/Documentation/compiling/mac-osx.txt
index 678e8bfb4e..1663cf2b6f 100644
--- a/Documentation/compiling/mac-osx.txt
+++ b/Documentation/compiling/mac-osx.txt
@@ -112,6 +112,10 @@ CMAKE_CXX_FLAGS = -D__ASSERTMACROS__
 Then we invoke make:
 user@mac-osx$ make
 
+It is also possible to give all the options on the commandline and not to edit the CMakeCache.txt. This is a oneliner for Leopard and up:
+
+cmake ~/Repositories/testing -DKICAD_TESTING_VERSION=ON -DCMAKE_OSX_ARCHITECTURES="i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6" -DCMAKE_CXX_FLAGS="-D__ASSERTMACROS__" -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
+
 Optional compiler cache
 ~~~~~~~~~~~~~~~~~~~~~~~
 If you (re)compile often, you would love to use cache. The best is to install it using macports and set the libexec symlink
@@ -160,4 +164,4 @@ Make sure you marked the build type Release:
 
 //Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
 // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
-CMAKE_BUILD_TYPE:STRING=Release
\ No newline at end of file
+CMAKE_BUILD_TYPE:STRING=Release
diff --git a/README.txt b/README.txt
index 3ea49163aa..da5b569b05 100644
--- a/README.txt
+++ b/README.txt
@@ -26,7 +26,7 @@ CMakeModules   - Modules for the CMAKE build tool
 common         - Sourcecode of the common library (common functions shared across whole suite)
 cvpcb          - Sourcecode of CvPCB, tool to link components with footprints sourcecode
 demos          - Some demo examples
-Documentation  - Misc documentation. Translating the GUI, old changelogs etcetera.
+Documentation  - Compiling documentation. Translating the GUI, old changelogs etcetera.
 eeschema       - Sourcecode of the schematic editor
 gerbview       - Sourcecode of the gerber viewer
 helpers        - Helper tools and utilities for development
diff --git a/eeschema/Info.plist b/eeschema/Info.plist
index 6f5027a0da..abb6d796d7 100644
--- a/eeschema/Info.plist
+++ b/eeschema/Info.plist
@@ -5,6 +5,8 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>sch</string>
diff --git a/gerbview/Info.plist b/gerbview/Info.plist
index 41d76aad0e..4cf3b724c9 100644
--- a/gerbview/Info.plist
+++ b/gerbview/Info.plist
@@ -33,6 +33,8 @@
 			<string>gerbview document</string>
 			<key>LSHandlerRank</key>
 			<string>Default</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
 		</dict>
 	</array>
 	<key>CFBundleDevelopmentRegion</key>
diff --git a/kicad/Info.plist b/kicad/Info.plist
index e5ef4376d9..23fa6f97cb 100644
--- a/kicad/Info.plist
+++ b/kicad/Info.plist
@@ -5,6 +5,8 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
 			<key>CFBundleTypeIconFile</key>
 			<string>kicad_doc.icns</string>
 			<key>CFBundleTypeExtensions</key>
diff --git a/pcb_calculator/Info.plist b/pcb_calculator/Info.plist
new file mode 100644
index 0000000000..fef07ffd2a
--- /dev/null
+++ b/pcb_calculator/Info.plist
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleTypeExtensions</key>
+			<key>CFBundleTypeIconFile</key>
+			<string>pcb_calculator.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>pcb_calculator document</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+		</dict>
+	</array>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>pcb_calculator</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>pcb_calculator.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.pcb_calculator</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string></string>
+	<key>CFBundleName</key>
+	<string>PCB Calculator</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string></string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/pcb_calculator/pcb_calculator.icns b/pcb_calculator/pcb_calculator.icns
new file mode 100644
index 0000000000..0d85306292
Binary files /dev/null and b/pcb_calculator/pcb_calculator.icns differ
diff --git a/pcbnew/Info.plist b/pcbnew/Info.plist
index b708119566..33d718d2cd 100644
--- a/pcbnew/Info.plist
+++ b/pcbnew/Info.plist
@@ -5,6 +5,8 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
 			<key>CFBundleTypeIconFile</key>
 			<string>pcbnew_doc.icns</string>
 			<key>CFBundleTypeExtensions</key>