diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index c10fa630498b33d73060299eb86b3c3cdf4f97f3..d1ab264a413b8a3eaf263ea3bbef32e59ac42e9c 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -13,11 +13,7 @@ set(LLCOMMON_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
     )
 
-if (WINDOWS)
-   set(LLCOMMON_LIBRARIES llcommon iphlpapi)
-else (WINDOWS)
-   set(LLCOMMON_LIBRARIES llcommon)
-endif (WINDOWS)
+set(LLCOMMON_LIBRARIES llcommon)
 
 add_definitions(${TCMALLOC_FLAG})
 
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 3a11753683b07de9731112d04f5facc4175aa424..583c1e589b473158536fe4e396b2729c590732b2 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -36,6 +36,8 @@
 #undef WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
 #include <windows.h>
+// ugh, this is ugly.  We need to straighten out our linking for this library
+#pragma comment(lib, "IPHLPAPI.lib")
 #include <iphlpapi.h>
 #endif