diff --git a/code/CMakeModules/CheckDepends.cmake b/code/CMakeModules/CheckDepends.cmake
index 2364233c1..abbae21ac 100644
--- a/code/CMakeModules/CheckDepends.cmake
+++ b/code/CMakeModules/CheckDepends.cmake
@@ -27,7 +27,7 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
     ENDIF(CMAKE_OTOOL)
     IF(CMAKE_NM)
       # Use nm to check if a library is using an external symbol
-      EXEC_PROGRAM(${CMAKE_NM} ARGS "-gu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL)
+      EXEC_PROGRAM(${CMAKE_NM} ARGS "-Dgu ${${MYLIBRARY}} | grep ${SYMBOL}" OUTPUT_VARIABLE NM_SYMBOL)
       IF(NOT NM_SYMBOL MATCHES ${SYMBOL})
         SET(${SYMBOL_FOUND} FALSE)
       ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake
index 52c52f38e..aa76955e1 100644
--- a/code/CMakeModules/FindLibwww.cmake
+++ b/code/CMakeModules/FindLibwww.cmake
@@ -127,6 +127,7 @@ LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWNEWS_LIBRARY HTLoadNews)
 LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWTELNET_LIBRARY HTLoadTelnet)
 
 LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWSTREAM_LIBRARY HTStreamToChunk)
+LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWSTREAM_LIBRARY HTGuess_new)
 LINK_WWW_LIBRARY(LIBWWWFILE_LIBRARY LIBWWWDIR_LIBRARY HTDir_new)
 LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWINIT_LIBRARY HTProtocolInit)
 LINK_WWW_LIBRARY(LIBWWWAPP_LIBRARY LIBWWWXML_LIBRARY HTXML_new)