diff --git a/code/CMakeModules/FindLibwww.cmake b/code/CMakeModules/FindLibwww.cmake
index 8e50a5761..2b268a695 100644
--- a/code/CMakeModules/FindLibwww.cmake
+++ b/code/CMakeModules/FindLibwww.cmake
@@ -57,11 +57,17 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
     /opt/lib
     /usr/freeware/lib64
   )
+  
+  IF(${MYLIBRARY})
+    SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}})
+  ELSE(${MYLIBRARY})
+    MESSAGE(STATUS "Libwww: Could not find: ${MYLIBRARY}")
+  ENDIF(${MYLIBRARY})
+  
 ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
 
 # on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"
 # we need to link them all manually
-
 FIND_WWW_LIBRARY(LIBMD5_LIBRARY md5)
 FIND_WWW_LIBRARY(LIBWWWAPP_LIBRARY wwwapp)
 FIND_WWW_LIBRARY(LIBWWWCACHE_LIBRARY wwwcache)
@@ -83,13 +89,6 @@ FIND_WWW_LIBRARY(LIBWWWUTILS_LIBRARY wwwutils)
 FIND_WWW_LIBRARY(LIBWWWXML_LIBRARY wwwxml)
 FIND_WWW_LIBRARY(LIBWWWZIP_LIBRARY wwwzip)
 
-# combine all the libraries into one variable
-SET(LIBWWW_LIBRARIES
-   ${LIBWWWAPP_LIBRARY} ${LIBWWWCORE_LIBRARY} ${LIBWWWDIR_LIBRARY} ${LIBWWWHTML_LIBRARY}
-  ${LIBWWWHTTP_LIBRARY} ${LIBWWWINIT_LIBRARY} ${LIBWWWMIME_LIBRARY} ${LIBWWWMUX_LIBRARY} 
-  ${LIBWWWSTREAM_LIBRARY}  ${LIBWWWCACHE_LIBRARY} ${LIBWWWFILE_LIBRARY} ${LIBWWWTRANS_LIBRARY} ${LIBWWWUTILS_LIBRARY} 
-)
-
 # Windows libwww version needs GNU Regex
 IF(WIN32)
   FIND_PATH(LIBWWW_REGEX_INCLUDE_DIR
@@ -107,7 +106,7 @@ IF(WIN32)
   IF(LIBWWW_REGEX_INCLUDE_DIR)
     SET(LIBWWW_INCLUDE_DIR ${LIBWWW_INCLUDE_DIR} ${LIBWWW_REGEX_INCLUDE_DIR})
     FIND_WWW_LIBRARY(LIBREGEX_LIBRARY gnu_regex)
-    SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY})
+    #SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${LIBREGEX_LIBRARY})
   ENDIF(LIBWWW_REGEX_INCLUDE_DIR)
 ELSE(WIN32)
   FIND_PACKAGE(EXPAT)