Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 1491)
+++ trunk/build.xml	(revision 1492)
@@ -66,4 +66,18 @@
 	</target>
 
+	<target name="distmac" depends="dist">
+		<!-- modify MacOS X Info.plist file to hold the SVN version number -->
+		<copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
+		<replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
+		<!-- create ZIP file with MacOS X application bundle -->
+		<zip destfile="dist/josm-custom-macosx.zip" update="true">
+			<zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
+			<zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
+			<zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
+			<zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
+			<zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
+		</zip>
+	</target>
+
 	<target name="compile" depends="init">
 		<javac srcdir="src" classpathref="classpath" destdir="build"
Index: trunk/macosx/JOSM.app/Contents/Info.plist
===================================================================
--- trunk/macosx/JOSM.app/Contents/Info.plist	(revision 1492)
+++ trunk/macosx/JOSM.app/Contents/Info.plist	(revision 1492)
@@ -0,0 +1,46 @@
+<?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>CFBundleAllowMixedLocalizations</key>
+	<string>true</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>JOSM</string>
+	<key>CFBundleGetInfoString</key>
+	<string>@SVNVersion@ SVN</string>
+	<key>CFBundleIconFile</key>
+	<string>JOSM.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.openstreetmap.josm</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>JOSM</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>@SVNVersion@</string>
+	<key>Java</key>
+	<dict>
+		<key>ClassPath</key>
+		<string>$JAVAROOT/josm-custom.jar</string>
+		<key>JVMVersion</key>
+		<string>1.5+</string>
+		<key>MainClass</key>
+		<string>org.openstreetmap.josm.gui.MainApplication</string>
+		<key>Properties</key>
+		<dict>
+			<key>apple.laf.useScreenMenuBar</key>
+			<string>true</string>
+		</dict>
+		<key>VMOptions</key>
+		<string>-Xmx512m</string>
+		<key>WorkingDirectory</key>
+		<string>$APP_PACKAGE/Contents/Resources/Java</string>
+	</dict>
+</dict>
+</plist>
Index: trunk/macosx/JOSM.app/Contents/PkgInfo
===================================================================
--- trunk/macosx/JOSM.app/Contents/PkgInfo	(revision 1492)
+++ trunk/macosx/JOSM.app/Contents/PkgInfo	(revision 1492)
@@ -0,0 +1,1 @@
+APPL????
Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1491)
+++ trunk/presets/presets.xml	(revision 1492)
@@ -1808,5 +1808,5 @@
             <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
         </item>
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway.relation">
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
             <label text="Edit Racetrack" />
             <key key="leisure" value="track" />
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 1491)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 1492)
@@ -452,6 +452,6 @@
      */
     public void setIcon(String iconName) {
-        String s = Main.pref.get("taggingpreset.iconpaths");
-        ImageIcon icon = ImageProvider.getIfAvailable((s != null ? s.split(";") : null), "presets", null, iconName);
+        Collection<String> s = Main.pref.getCollection("taggingpreset.iconpaths", null);
+        ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName);
         if (icon == null)
         {