diff --git a/Info.plist.in b/Info.plist.in
deleted file mode 100644
index fca56cd45c..0000000000
--- a/Info.plist.in
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.kicad-eda.EXECUTABLE</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
-	<key>CFBundleIconFile</key>
-	<string>EXECUTABLE.icns</string>
-	<key>CFBundleName</key>
-	<string>EXECUTABLE</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.1</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
-	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version 0.1</string>
-	<key>CFBundleLongVersionString</key>
-	<string>0.1</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyleft 2007</string>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
diff --git a/cvpcb/Info.plist b/cvpcb/Info.plist
new file mode 100644
index 0000000000..264f87762a
--- /dev/null
+++ b/cvpcb/Info.plist
@@ -0,0 +1,18 @@
+<?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>CFBundleDisplayName</key>
+	<string>cvpcb</string>
+	<key>CFBundleExecutable</key>
+	<string>cvpcb</string>
+	<key>CFBundleIconFile</key>
+	<string>cvpcb.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.cvpcb</string>
+	<key>CFBundleName</key>
+	<string>Cvpcb</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+</dict>
+</plist>
diff --git a/cvpcb/cvpcb.icns b/cvpcb/cvpcb.icns
index 5ec807b5d6..360820273d 100644
Binary files a/cvpcb/cvpcb.icns and b/cvpcb/cvpcb.icns differ
diff --git a/cvpcb/makefile.macosx b/cvpcb/makefile.macosx
index e8715b9123..a9605a49ab 100644
--- a/cvpcb/makefile.macosx
+++ b/cvpcb/makefile.macosx
@@ -22,12 +22,10 @@ $(TARGET).app: $(TARGET)
 	mkdir -p $(TARGET).app
 	mkdir -p $(TARGET).app/Contents
 	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Frameworks
 	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources/$(TARGET).icns
-	sed -e "s/EXECUTABLE/$(TARGET)/" ../Info.plist.in \
-	>$(TARGET).app/Contents/Info.plist
-	echo -n "APPL????" >$(TARGET).app/Contents/PkgInfo
+	cp $(TARGET).icns $(TARGET).app/Contents/Resources
+	cp Info.plist $(TARGET).app/Contents
+	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
 	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
 
 install: $(TARGET).app
diff --git a/eeschema/Info.plist b/eeschema/Info.plist
new file mode 100644
index 0000000000..eb6ec7e9ef
--- /dev/null
+++ b/eeschema/Info.plist
@@ -0,0 +1,29 @@
+<?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>CFBundleDisplayName</key>
+	<array/>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>sch</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file_sch.icns</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>eeschema</string>
+	<key>CFBundleIconFile</key>
+	<string>eeschema.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.eeschema</string>
+	<key>CFBundleName</key>
+	<string>Schematics</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+</dict>
+</plist>
diff --git a/eeschema/eeschema.icns b/eeschema/eeschema.icns
index 5ec807b5d6..c4e9ded119 100644
Binary files a/eeschema/eeschema.icns and b/eeschema/eeschema.icns differ
diff --git a/eeschema/makefile.macosx b/eeschema/makefile.macosx
index 1c7c0cd071..fc532c7916 100644
--- a/eeschema/makefile.macosx
+++ b/eeschema/makefile.macosx
@@ -22,12 +22,11 @@ $(TARGET).app: $(TARGET)
 	mkdir -p $(TARGET).app
 	mkdir -p $(TARGET).app/Contents
 	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Frameworks
 	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources/$(TARGET).icns
-	sed -e "s/EXECUTABLE/$(TARGET)/" ../Info.plist.in \
-	>$(TARGET).app/Contents/Info.plist
-	echo -n "APPL????" >$(TARGET).app/Contents/PkgInfo
+	cp $(TARGET).icns $(TARGET).app/Contents/Resources
+	cp file_sch.icns $(TARGET).app/Contents/Resources
+	cp Info.plist $(TARGET).app/Contents
+	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
 	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
 
 netlist_form_pads-pcb: plugins/netlist_form_pads-pcb.cpp
diff --git a/gerbview/Info.plist b/gerbview/Info.plist
new file mode 100644
index 0000000000..044b41085f
--- /dev/null
+++ b/gerbview/Info.plist
@@ -0,0 +1,18 @@
+<?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>CFBundleDisplayName</key>
+	<string>gerbview</string>
+	<key>CFBundleExecutable</key>
+	<string>gerbview</string>
+	<key>CFBundleIconFile</key>
+	<string>gerbview.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.gerbview</string>
+	<key>CFBundleName</key>
+	<string>Gerbview</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+</dict>
+</plist>
diff --git a/gerbview/gerbview.icns b/gerbview/gerbview.icns
index 5ec807b5d6..cc4d8a83e6 100644
Binary files a/gerbview/gerbview.icns and b/gerbview/gerbview.icns differ
diff --git a/gerbview/makefile.macosx b/gerbview/makefile.macosx
index c7aed63583..881b75a474 100644
--- a/gerbview/makefile.macosx
+++ b/gerbview/makefile.macosx
@@ -21,12 +21,10 @@ $(TARGET).app: $(TARGET)
 	mkdir -p $(TARGET).app
 	mkdir -p $(TARGET).app/Contents
 	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Frameworks
 	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources/$(TARGET).icns
-	sed -e "s/EXECUTABLE/$(TARGET)/" ../Info.plist.in \
-	>$(TARGET).app/Contents/Info.plist
-	echo -n "APPL????" >$(TARGET).app/Contents/PkgInfo
+	cp $(TARGET).icns $(TARGET).app/Contents/Resources
+	cp Info.plist $(TARGET).app/Contents
+	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
 	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
 
 install: $(TARGET).app
diff --git a/kicad/Info.plist b/kicad/Info.plist
new file mode 100644
index 0000000000..b24ddc720c
--- /dev/null
+++ b/kicad/Info.plist
@@ -0,0 +1,29 @@
+<?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>CFBundleDisplayName</key>
+	<string>Kicad Project Manager</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>pro</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>file_pro.icns</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>kicad</string>
+	<key>CFBundleIconFile</key>
+	<string>kicad.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.kicad</string>
+	<key>CFBundleName</key>
+	<string>Kicad</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+</dict>
+</plist>
diff --git a/kicad/kicad.icns b/kicad/kicad.icns
index 5ec807b5d6..fc9d052862 100644
Binary files a/kicad/kicad.icns and b/kicad/kicad.icns differ
diff --git a/kicad/makefile.macosx b/kicad/makefile.macosx
index ae11992e44..ea2fa3455e 100644
--- a/kicad/makefile.macosx
+++ b/kicad/makefile.macosx
@@ -22,12 +22,11 @@ $(TARGET).app: $(TARGET)
 	mkdir -p $(TARGET).app
 	mkdir -p $(TARGET).app/Contents
 	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Frameworks
 	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources/$(TARGET).icns
-	sed -e "s/EXECUTABLE/$(TARGET)/" ../Info.plist.in \
-	>$(TARGET).app/Contents/Info.plist
-	echo -n "APPL????" >$(TARGET).app/Contents/PkgInfo
+	cp $(TARGET).icns $(TARGET).app/Contents/Resources
+	cp file_pro.icns $(TARGET).app/Contents/Resources
+	cp Info.plist $(TARGET).app/Contents
+	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
 	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
 
 install: $(TARGET).app
diff --git a/pcbnew/Info.plist b/pcbnew/Info.plist
new file mode 100644
index 0000000000..c8902115c1
--- /dev/null
+++ b/pcbnew/Info.plist
@@ -0,0 +1,18 @@
+<?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>CFBundleDisplayName</key>
+	<string>Pcb Router</string>
+	<key>CFBundleExecutable</key>
+	<string>pcbnew</string>
+	<key>CFBundleIconFile</key>
+	<string>pcbnew.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.kicad-eda.pcbnew</string>
+	<key>CFBundleName</key>
+	<string>pcbnew</string>
+	<key>LSRequiresCarbon</key>
+	<true/>
+</dict>
+</plist>
diff --git a/pcbnew/makefile.macosx b/pcbnew/makefile.macosx
index 4eee86da54..60392961a5 100644
--- a/pcbnew/makefile.macosx
+++ b/pcbnew/makefile.macosx
@@ -21,12 +21,10 @@ $(TARGET).app: $(TARGET)
 	mkdir -p $(TARGET).app
 	mkdir -p $(TARGET).app/Contents
 	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Frameworks
 	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources/$(TARGET).icns
-	sed -e "s/EXECUTABLE/$(TARGET)/" ../Info.plist.in \
-	>$(TARGET).app/Contents/Info.plist
-	echo -n "APPL????" >$(TARGET).app/Contents/PkgInfo
+	cp $(TARGET).icns $(TARGET).app/Contents/Resources
+	cp Info.plist $(TARGET).app/Contents
+	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
 	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
 
 install: $(TARGET).app
diff --git a/pcbnew/pcbnew.icns b/pcbnew/pcbnew.icns
index 5ec807b5d6..1e6449dd8a 100644
Binary files a/pcbnew/pcbnew.icns and b/pcbnew/pcbnew.icns differ