diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 55c32a280..c07369e2e 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,5 +1,5 @@
 Source: boost
-Version: 1.65.1-2
+Version: 1.65.1-3
 Description: Peer-reviewed portable C++ source libraries
 Build-Depends: zlib, bzip2
 
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 57dc081da..a14172452 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -258,7 +258,7 @@ file(
 
 # Disable Boost auto-link.
 file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
-	"\n#define BOOST_ALL_NO_LIB\n"
+    "\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n"
 )
 file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
     "\n#undef BOOST_ALL_DYN_LINK\n"