diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 8c0f0058b..877887b81 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -1,8 +1,8 @@
+set(DEFAULT_WITH_BOOTSTRAP ON)
 if(APPLE)
-  set(WITH_BOOTSTRAP OFF)
-else()
-  option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ON)
+  set(DEFAULT_WITH_BOOTSTRAP OFF)
 endif()
+option(WITH_BOOTSTRAP "build lokinet-bootstrap tool" ${DEFAULT_WITH_BOOTSTRAP})
 
 add_executable(lokinet-vpn lokinet-vpn.cpp)
 if(APPLE)
@@ -10,11 +10,11 @@ if(APPLE)
   enable_lto(lokinet)
 else()
   add_executable(lokinet lokinet.cpp)
+  enable_lto(lokinet lokinet-vpn)
+
   if(WITH_BOOTSTRAP)
     add_executable(lokinet-bootstrap lokinet-bootstrap.cpp)
-    enable_lto(lokinet lokinet-vpn lokinet-bootstrap)
-  else()
-    enable_lto(lokinet lokinet-vpn)
+    enable_lto(lokinet-bootstrap)
   endif()
 endif()