diff --git a/ompi/CMakeLists.txt b/ompi/CMakeLists.txt
index d6f31555a8..ed9f12ca8f 100644
--- a/ompi/CMakeLists.txt
+++ b/ompi/CMakeLists.txt
@@ -125,7 +125,7 @@ SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS
 IF (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libmpi PROPERTIES 
     COMPILE_FLAGS "-D_USRDLL -DHAVE_CONFIG_H -DOMPI_EXPORTS /TP")
-  TARGET_LINK_LIBRARIES (libmpi libopen-rte)
+  TARGET_LINK_LIBRARIES (libmpi libopen-rte Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libmpi PROPERTIES COMPILE_FLAGS "-D_LIB")
 ENDIF(BUILD_SHARED_LIBS)
diff --git a/ompi/mca/bml/r2/.windows b/ompi/mca/bml/r2/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/bml/r2/.windows
+++ b/ompi/mca/bml/r2/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mca/btl/sm/.windows b/ompi/mca/btl/sm/.windows
index 32b4009ce3..49d5029a49 100644
--- a/ompi/mca/btl/sm/.windows
+++ b/ompi/mca/btl/sm/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi libmca_common_sm
+mca_link_libraries=libmpi libopen-rte libmca_common_sm
diff --git a/ompi/mca/btl/tcp/.windows b/ompi/mca/btl/tcp/.windows
index 08f0304c72..d21e119be0 100644
--- a/ompi/mca/btl/tcp/.windows
+++ b/ompi/mca/btl/tcp/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte Ws2_32.lib
diff --git a/ompi/mca/coll/sm/.windows b/ompi/mca/coll/sm/.windows
index 32b4009ce3..49d5029a49 100644
--- a/ompi/mca/coll/sm/.windows
+++ b/ompi/mca/coll/sm/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi libmca_common_sm
+mca_link_libraries=libmpi libopen-rte libmca_common_sm
diff --git a/ompi/mca/coll/sync/.windows b/ompi/mca/coll/sync/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/coll/sync/.windows
+++ b/ompi/mca/coll/sync/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mca/dpm/orte/.windows b/ompi/mca/dpm/orte/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/dpm/orte/.windows
+++ b/ompi/mca/dpm/orte/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mca/mpool/rdma/.windows b/ompi/mca/mpool/rdma/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/mpool/rdma/.windows
+++ b/ompi/mca/mpool/rdma/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mca/mpool/sm/.windows b/ompi/mca/mpool/sm/.windows
index 32b4009ce3..49d5029a49 100644
--- a/ompi/mca/mpool/sm/.windows
+++ b/ompi/mca/mpool/sm/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi libmca_common_sm
+mca_link_libraries=libmpi libopen-rte libmca_common_sm
diff --git a/ompi/mca/pml/ob1/.windows b/ompi/mca/pml/ob1/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/pml/ob1/.windows
+++ b/ompi/mca/pml/ob1/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mca/pubsub/orte/.windows b/ompi/mca/pubsub/orte/.windows
index 08f0304c72..cc346daabd 100644
--- a/ompi/mca/pubsub/orte/.windows
+++ b/ompi/mca/pubsub/orte/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libmpi
+mca_link_libraries=libmpi libopen-rte
diff --git a/ompi/mpi/cxx/CMakeLists.txt b/ompi/mpi/cxx/CMakeLists.txt
index faf7e033ea..01f8010560 100644
--- a/ompi/mpi/cxx/CMakeLists.txt
+++ b/ompi/mpi/cxx/CMakeLists.txt
@@ -28,7 +28,7 @@ SET_TARGET_PROPERTIES (libmpi_cxx PROPERTIES LINKER_LANGUAGE CXX)
 # Set compile flags for this target
 IF (BUILD_SHARED_LIBS)
 
-  TARGET_LINK_LIBRARIES(libmpi_cxx libmpi)
+  TARGET_LINK_LIBRARIES(libmpi_cxx libmpi libopen-pal)
   # Need OMPI_BUILDING_CXX_BINDINGS_LIBRARY so that we can get the path 
   # names correct inside the MPI C++ library.  OMPI_SKIP_MPICXX is necessary
   # so that mpi.h doesn't include mpicxx.h through the incorrect pathname 
diff --git a/ompi/tools/ompi-server/CMakeLists.txt b/ompi/tools/ompi-server/CMakeLists.txt
index 7b760c1598..148c92e4ab 100644
--- a/ompi/tools/ompi-server/CMakeLists.txt
+++ b/ompi/tools/ompi-server/CMakeLists.txt
@@ -19,7 +19,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (ompi-server libmpi)
+TARGET_LINK_LIBRARIES (ompi-server libmpi libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 INSTALL(TARGETS ompi-server
   DESTINATION bin)
diff --git a/ompi/tools/ompi_info/CMakeLists.txt b/ompi/tools/ompi_info/CMakeLists.txt
index 227b830dc2..52924849a4 100644
--- a/ompi/tools/ompi_info/CMakeLists.txt
+++ b/ompi/tools/ompi_info/CMakeLists.txt
@@ -19,7 +19,8 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (ompi_info libmpi)
+TARGET_LINK_LIBRARIES (ompi_info libmpi libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)
+
 INSTALL(TARGETS ompi_info
   DESTINATION bin)
 INSTALL(FILES help-ompi_info.txt DESTINATION share/openmpi)
diff --git a/opal/tools/opal-checkpoint/CMakeLists.txt b/opal/tools/opal-checkpoint/CMakeLists.txt
index 909eac925f..c9f6c142b6 100644
--- a/opal/tools/opal-checkpoint/CMakeLists.txt
+++ b/opal/tools/opal-checkpoint/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal)
+TARGET_LINK_LIBRARIES (opal-checkpoint libopen-pal Ws2_32.lib shlwapi.lib)
 
 INSTALL(TARGETS opal-checkpoint
   DESTINATION bin)
diff --git a/opal/tools/opal-restart/CMakeLists.txt b/opal/tools/opal-restart/CMakeLists.txt
index 622760fcc4..efa5d7f09b 100644
--- a/opal/tools/opal-restart/CMakeLists.txt
+++ b/opal/tools/opal-restart/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (opal-restart libopen-pal)
+TARGET_LINK_LIBRARIES (opal-restart libopen-pal Ws2_32.lib shlwapi.lib)
 
 INSTALL(TARGETS opal-restart
   DESTINATION bin)
diff --git a/opal/tools/wrappers/CMakeLists.txt b/opal/tools/wrappers/CMakeLists.txt
index 5b8d83d8e4..7cd24940bc 100644
--- a/opal/tools/wrappers/CMakeLists.txt
+++ b/opal/tools/wrappers/CMakeLists.txt
@@ -11,7 +11,7 @@ FILE(GLOB_RECURSE OPAL_WRAPPER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
 
 ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES})
 
-TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal)
+TARGET_LINK_LIBRARIES (opal-wrapper libopen-pal Ws2_32.lib shlwapi.lib)
 
 IF(BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(opal-wrapper PROPERTIES
diff --git a/orte/CMakeLists.txt b/orte/CMakeLists.txt
index efd1064552..8963d9bc04 100644
--- a/orte/CMakeLists.txt
+++ b/orte/CMakeLists.txt
@@ -60,7 +60,7 @@ ADD_LIBRARY (libopen-rte ${ORTE_SOURCE_FILES})
 IF (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libopen-rte PROPERTIES
     COMPILE_FLAGS "-D_USRDLL -DORTE_EXPORTS -DOPAL_IMPORTS /TP")
-  TARGET_LINK_LIBRARIES (libopen-rte libopen-pal)
+  TARGET_LINK_LIBRARIES (libopen-rte libopen-pal Ws2_32.lib shlwapi.lib)
 ELSE (BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(libopen-rte PROPERTIES COMPILE_FLAGS "-D_LIB /TP")
 ENDIF(BUILD_SHARED_LIBS)
diff --git a/orte/mca/iof/hnp/.windows b/orte/mca/iof/hnp/.windows
index 7a934e8f29..c31ec9526c 100644
--- a/orte/mca/iof/hnp/.windows
+++ b/orte/mca/iof/hnp/.windows
@@ -1,4 +1,4 @@
-#
+'#
 # Copyright (c) 2008-2010 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libopen-rte
+mca_link_libraries=libopen-rte Ws2_32.lib
diff --git a/orte/mca/iof/orted/.windows b/orte/mca/iof/orted/.windows
index 7a934e8f29..07efcb4832 100644
--- a/orte/mca/iof/orted/.windows
+++ b/orte/mca/iof/orted/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libopen-rte
+mca_link_libraries=libopen-rte Ws2_32.lib
diff --git a/orte/mca/oob/tcp/.windows b/orte/mca/oob/tcp/.windows
index 7a934e8f29..07efcb4832 100644
--- a/orte/mca/oob/tcp/.windows
+++ b/orte/mca/oob/tcp/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libopen-rte
+mca_link_libraries=libopen-rte Ws2_32.lib
diff --git a/orte/mca/rml/oob/.windows b/orte/mca/rml/oob/.windows
index 7a934e8f29..07efcb4832 100644
--- a/orte/mca/rml/oob/.windows
+++ b/orte/mca/rml/oob/.windows
@@ -9,4 +9,4 @@
 #
 
 # Specific to this module
-mca_link_libraries=libopen-rte
+mca_link_libraries=libopen-rte Ws2_32.lib
diff --git a/orte/tools/orte-checkpoint/CMakeLists.txt b/orte/tools/orte-checkpoint/CMakeLists.txt
index daaf27057f..f1b4e29f9d 100644
--- a/orte/tools/orte-checkpoint/CMakeLists.txt
+++ b/orte/tools/orte-checkpoint/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orte-checkpoint libopen-rte)
+TARGET_LINK_LIBRARIES (orte-checkpoint libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 ADD_CUSTOM_COMMAND (TARGET orte-checkpoint
   POST_BUILD
diff --git a/orte/tools/orte-clean/CMakeLists.txt b/orte/tools/orte-clean/CMakeLists.txt
index 62fa5a0a3f..f4eb5871ae 100644
--- a/orte/tools/orte-clean/CMakeLists.txt
+++ b/orte/tools/orte-clean/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orte-clean libopen-rte)
+TARGET_LINK_LIBRARIES (orte-clean libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 ADD_CUSTOM_COMMAND (TARGET orte-clean
   POST_BUILD
diff --git a/orte/tools/orte-ps/CMakeLists.txt b/orte/tools/orte-ps/CMakeLists.txt
index f4666664fa..dd4a7f2124 100644
--- a/orte/tools/orte-ps/CMakeLists.txt
+++ b/orte/tools/orte-ps/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orte-ps libopen-rte)
+TARGET_LINK_LIBRARIES (orte-ps libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 ADD_CUSTOM_COMMAND (TARGET orte-ps
   POST_BUILD
diff --git a/orte/tools/orte-restart/CMakeLists.txt b/orte/tools/orte-restart/CMakeLists.txt
index 71e27ff5b4..d14e1ef53f 100644
--- a/orte/tools/orte-restart/CMakeLists.txt
+++ b/orte/tools/orte-restart/CMakeLists.txt
@@ -16,4 +16,4 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orte-restart libopen-rte)
+TARGET_LINK_LIBRARIES (orte-restart libopen-pal libopen-rte)
diff --git a/orte/tools/orted/CMakeLists.txt b/orte/tools/orted/CMakeLists.txt
index 1f13f7f9ad..e9826f506f 100644
--- a/orte/tools/orted/CMakeLists.txt
+++ b/orte/tools/orted/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orted libopen-rte)
+TARGET_LINK_LIBRARIES (orted libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 INSTALL(TARGETS orted
   DESTINATION bin)
diff --git a/orte/tools/orterun/CMakeLists.txt b/orte/tools/orterun/CMakeLists.txt
index 160bce89bb..c61f5e9289 100644
--- a/orte/tools/orterun/CMakeLists.txt
+++ b/orte/tools/orterun/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(BUILD_SHARED_LIBS)
     COMPILE_FLAGS "-D_USRDLL -DOPAL_IMPORTS -DOMPI_IMPORTS -DORTE_IMPORTS /TP")
 ENDIF(BUILD_SHARED_LIBS)
 
-TARGET_LINK_LIBRARIES (orterun libopen-rte)
+TARGET_LINK_LIBRARIES (orterun libopen-pal libopen-rte Ws2_32.lib shlwapi.lib)
 
 ADD_CUSTOM_COMMAND (TARGET orterun
   POST_BUILD