diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
index 3d63459f02bb7226e0058cbdae02688dbad38ad5..49b348e9f7c98ce4d1dcf7c634e193e5e1134b30 100644
--- a/indra/cmake/Havok.cmake
+++ b/indra/cmake/Havok.cmake
@@ -6,15 +6,13 @@ list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo)
 
 set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug)
 set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok)
-if (LL_DEBUG_HAVOK)
-    if (WIN32)
-        set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid)
-    else (WIN32)
-        set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug)
-    endif(WIN32)
-else (LL_DEBUG_HAVOK)
-    set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok)
-endif (LL_DEBUG_HAVOK)
+
+if (LL_DEBUG_HAVOK AND NOT WIN32)
+    set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug)
+else (LL_DEBUG_HAVOK AND NOT WIN32)
+    # Always link relwithdebinfo to havok-hybrid on windows.
+    set(HAVOK_RELWITHDEBINFO_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-hybrid)
+endif (LL_DEBUG_HAVOK AND NOT WIN32)
 
 
 set(HAVOK_LIBS