diff --git a/makefile b/makefile
index d2b2f9b0a5..51b5046c6d 100644
--- a/makefile
+++ b/makefile
@@ -317,7 +317,8 @@ $(driver-object): $(driver-source)
 $(driver-dynamic-object): $(driver-source)
 	@echo "compiling $(@)"
 	@mkdir -p $(dir $(@))
-	$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(name)\" -c $(<) -o $(@)
+	$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)$(name)$(so-suffix)\" \
+		-c $(<) -o $(@)
 
 $(boot-object): $(boot-source)
 	$(compile-object)
diff --git a/src/finder.cpp b/src/finder.cpp
index dadfb9dadb..02159f2e96 100644
--- a/src/finder.cpp
+++ b/src/finder.cpp
@@ -448,7 +448,7 @@ class BuiltinElement: public JarElement {
 
   virtual void init() {
     if (index == 0) {
-      if (s->success(s->load(&library, libraryName, true))) {
+      if (s->success(s->load(&library, libraryName, false))) {
         void* p = library->resolve(name);
         if (p) {
           uint8_t* (*function)(unsigned*);
diff --git a/src/machine.cpp b/src/machine.cpp
index 17f6bb129e..a59def2a75 100644
--- a/src/machine.cpp
+++ b/src/machine.cpp
@@ -1689,7 +1689,7 @@ Machine::Machine(System* system, Heap* heap, Finder* finder,
       not system->success(system->make(&heapLock)) or
       not system->success(system->make(&classLock)) or
       not system->success(system->make(&referenceLock)) or
-      not system->success(system->load(&libraries, bootLibrary, true)))
+      not system->success(system->load(&libraries, bootLibrary, false)))
   {
     system->abort();
   }