diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index 7bf02db687..b88759df82 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -321,7 +321,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
         i += jobz;
     }
 
-    // Wait for all the worder threads to complete, it does not matter in what order
+    // Wait for all the worker threads to complete, it does not matter in what order
     // we wait for them as long as a full sweep is made.  Think of the great race,
     // everyone must finish.
     for( unsigned i=0;  i<threads.size();  ++i )
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 946c5c9684..8498688eaf 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -107,7 +107,6 @@ target_link_libraries( cvpcb
     ${GDI_PLUS_LIBRARIES}
     ${GLEW_LIBRARIES}
     ${CAIRO_LIBRARIES}
-    ${Boost_LIBRARIES}
     )
 
 # Only for win32 cross compilation using MXE
@@ -127,6 +126,9 @@ if( BUILD_GITHUB_PLUGIN )
     target_link_libraries( cvpcb github_plugin )
 endif()
 
+# Must follow github_plugin
+target_link_libraries( cvpcb ${Boost_LIBRARIES} )
+
 
 ###
 # Add cvpcb as install target
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 3d168700dc..e513133da8 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -379,7 +379,7 @@ if( KICAD_SCRIPTING_MODULES )
         ${GDI_PLUS_LIBRARIES}
         ${PYTHON_LIBRARIES}
         ${PCBNEW_EXTRA_LIBS}
-        ${Boost_LIBRARIES}
+        ${Boost_LIBRARIES}      # must follow GITHUB
         )
 
      # create .i files from XML doxygen parsing, docstrings.i will include all of them
@@ -533,8 +533,6 @@ endif()
 # Link executable target pcbnew with correct libraries
 ###
 
-message( STATUS "Boost_LIBRARIES:${Boost_LIBRARIES}" )
-
 target_link_libraries( pcbnew
     3d-viewer
     pcbcommon
@@ -553,7 +551,7 @@ target_link_libraries( pcbnew
     ${PCBNEW_EXTRA_LIBS}
     ${GLEW_LIBRARIES}
     ${CAIRO_LIBRARIES}
-    ${Boost_LIBRARIES}
+    ${Boost_LIBRARIES}      # must follow GITHUB
     )
 
 # Only for win32 cross compilation using MXE