diff --git a/classpath/java/util/Properties.java b/classpath/java/util/Properties.java
index 8a9fe5892f..207f6f577c 100644
--- a/classpath/java/util/Properties.java
+++ b/classpath/java/util/Properties.java
@@ -111,6 +111,13 @@ public class Properties extends Hashtable {
               finishLine(map);          
             }
             break;
+          case 'n':
+            if (escaped) {
+              append('\n');
+            } else {
+              append(c);
+            }
+            break;
 
           default:
             append(c);
diff --git a/makefile b/makefile
index 93824c4dea..c8d78b2e63 100644
--- a/makefile
+++ b/makefile
@@ -298,7 +298,7 @@ $(binaryToMacho): $(src)/binaryToMacho.cpp
 $(classpath-object): $(build)/classpath.jar $(binaryToMacho)
 ifeq ($(platform),darwin)
 	$(binaryToMacho) $(build)/classpath.jar \
-		__binary_classpath_jar_data __binary_classpath_jar_size > $(@)
+		__binary_classpath_jar_start __binary_classpath_jar_size > $(@)
 else
 	(wd=$$(pwd); \
 	 cd $(build); \
diff --git a/src/main.cpp b/src/main.cpp
index ffba794a31..a2617fa44e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,10 +19,9 @@ void operator delete(void*) { abort(); }
 #  define SYMBOL(x) _binary_classpath_jar_##x
 #endif
 
-extern "C" {
+#define BOOT_CLASSPATH "[classpathJar]"
 
-#ifndef __APPLE__
-#  define BOOT_CLASSPATH "[classpathJar]"
+extern "C" {
 
   extern const uint8_t SYMBOL(start)[];
   extern const uint8_t SYMBOL(size)[];
@@ -33,7 +32,6 @@ extern "C" {
     *size = reinterpret_cast<uintptr_t>(SYMBOL(size));
     return SYMBOL(start);
   }
-#endif
 
 }