diff --git a/Makefile.am b/Makefile.am
index 3f4aa1698a..7409d27009 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,7 +18,7 @@
 #
 
 SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
-EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.sh
+EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.sh CMakeLists.txt
 
 include examples/Makefile.include
 
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index cdc7db28a5..252d0f250a 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -74,6 +74,35 @@ EXTRA_DIST = \
         platform/lanl/tlcc/optimized-nopanasas \
         platform/lanl/tlcc/optimized-nopanasas.conf \
         platform/lanl/tlcc/optimized-panasas \
-        platform/lanl/tlcc/optimized-panasas.conf
+        platform/lanl/tlcc/optimized-panasas.conf \
+        platform/win32/bin/flex.exe \
+        platform/win32/opal/libltdl/ltdl.c \
+        platform/win32/opal/libltdl/ltdl.h \
+        platform/win32/CMakeModules/c_check_bool.cmake \
+        platform/win32/CMakeModules/check_c_inline.cmake \
+        platform/win32/CMakeModules/check_c_type_exists.cmake \
+        platform/win32/CMakeModules/check_mca_subdirs.cmake \
+        platform/win32/CMakeModules/check_sizeof_bool.cmake \
+        platform/win32/CMakeModules/f77_check.cmake \
+        platform/win32/CMakeModules/f77_check_real16_c_equiv.cmake \
+        platform/win32/CMakeModules/f77_check_type.cmake \
+        platform/win32/CMakeModules/f77_find_ext_symbol_convention.cmake \
+        platform/win32/CMakeModules/f77_get_alignment.cmake \
+        platform/win32/CMakeModules/f77_get_sizeof.cmake \
+        platform/win32/CMakeModules/find_flex.cmake \
+        platform/win32/CMakeModules/generate_version_file.cmake \
+        platform/win32/CMakeModules/get_c_alignment.cmake \
+        platform/win32/CMakeModules/ompi_check_Microsoft.cmake \
+        platform/win32/CMakeModules/ompi_configure.cmake \
+        platform/win32/CMakeModules/ompi_find_type.cmake \
+        platform/win32/CMakeModules/ompi_get_version.cmake \
+        platform/win32/CMakeModules/setup_f77.cmake \
+        platform/win32/ConfigFiles/install_dirs.h.cmake \
+        platform/win32/ConfigFiles/mpi.h.cmake \
+        platform/win32/ConfigFiles/mpic++-wrapper-data.txt.cmake \
+        platform/win32/ConfigFiles/mpicc-wrapper-data.txt.cmake \
+        platform/win32/ConfigFiles/mpif77-wrapper-data.txt.cmake \
+        platform/win32/ConfigFiles/opal_config.h.cmake \
+        platform/win32/ConfigFiles/revision.in
 
 
diff --git a/ompi/Makefile.am b/ompi/Makefile.am
index 417f8142e3..d7ad4bdcec 100644
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,7 +18,7 @@
 # $HEADER$
 #
 
-EXTRA_DIST=
+EXTRA_DIST = CMakeLists.txt
 
 # We always have C bindings, but do we have profiling?
 
diff --git a/ompi/mca/allocator/basic/Makefile.am b/ompi/mca/allocator/basic/Makefile.am
index 93e44c7ac0..cb08465919 100644
--- a/ompi/mca/allocator/basic/Makefile.am
+++ b/ompi/mca/allocator/basic/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         allocator_basic.c \
         allocator_basic.h 
diff --git a/ompi/mca/allocator/bucket/Makefile.am b/ompi/mca/allocator/bucket/Makefile.am
index 442cb386b9..45d2d816a9 100644
--- a/ompi/mca/allocator/bucket/Makefile.am
+++ b/ompi/mca/allocator/bucket/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         allocator_bucket.c \
         allocator_bucket_alloc.c \
diff --git a/ompi/mca/bml/r2/Makefile.am b/ompi/mca/bml/r2/Makefile.am
index d0f702e1ca..0c1c85f44d 100644
--- a/ompi/mca/bml/r2/Makefile.am
+++ b/ompi/mca/bml/r2/Makefile.am
@@ -3,7 +3,7 @@
 #						 All rights reserved.
 # Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
 #						 All rights reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #						 University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #						 All rights reserved.
@@ -14,6 +14,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 r2_sources  = \
 	bml_r2.c \
 	bml_r2.h \
diff --git a/ompi/mca/btl/self/Makefile.am b/ompi/mca/btl/self/Makefile.am
index 338c88833a..36c6c06ee0 100644
--- a/ompi/mca/btl/self/Makefile.am
+++ b/ompi/mca/btl/self/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 libmca_btl_self_la_sources = \
     btl_self.c \
     btl_self.h \
diff --git a/ompi/mca/btl/sm/Makefile.am b/ompi/mca/btl/sm/Makefile.am
index cf523e3e8e..0225e7fb35 100644
--- a/ompi/mca/btl/sm/Makefile.am
+++ b/ompi/mca/btl/sm/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 libmca_btl_sm_la_sources = \
     btl_sm.c \
     btl_sm.h \
diff --git a/ompi/mca/btl/tcp/Makefile.am b/ompi/mca/btl/tcp/Makefile.am
index e4a691f732..ab480ccc4a 100644
--- a/ompi/mca/btl/tcp/Makefile.am
+++ b/ompi/mca/btl/tcp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
     btl_tcp.c \
     btl_tcp.h \
diff --git a/ompi/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am
index 4183481934..49e3b2ad80 100644
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         coll_basic.h \
         coll_basic_allgather.c \
diff --git a/ompi/mca/coll/hierarch/Makefile.am b/ompi/mca/coll/hierarch/Makefile.am
index a323531a9d..99ef2663bb 100644
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
diff --git a/ompi/mca/coll/self/Makefile.am b/ompi/mca/coll/self/Makefile.am
index cdac428fd5..18ce466ceb 100644
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         coll_self.h \
         coll_self_allgather.c \
diff --git a/ompi/mca/coll/sm/Makefile.am b/ompi/mca/coll/sm/Makefile.am
index 3f8309e844..8dd945e5b6 100644
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 not_used_yet = \
         coll_sm_allgather.c \
         coll_sm_allgatherv.c \
diff --git a/ompi/mca/coll/sync/Makefile.am b/ompi/mca/coll/sync/Makefile.am
index 7bafa3c40e..4883859f7b 100644
--- a/ompi/mca/coll/sync/Makefile.am
+++ b/ompi/mca/coll/sync/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         coll_sync.h \
         coll_sync_component.c \
diff --git a/ompi/mca/common/sm/Makefile.am b/ompi/mca/common/sm/Makefile.am
index 6bd8f721d1..ae7f81276f 100644
--- a/ompi/mca/common/sm/Makefile.am
+++ b/ompi/mca/common/sm/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -38,6 +38,8 @@
 # Note that building this common component statically and linking
 # against other dynamic components is *not* supported!
 
+EXTRA_DIST = .windows
+
 # Header files
 
 headers = \
diff --git a/ompi/mca/dpm/orte/Makefile.am b/ompi/mca/dpm/orte/Makefile.am
index 57f9d04d2f..11565a2b9a 100644
--- a/ompi/mca/dpm/orte/Makefile.am
+++ b/ompi/mca/dpm/orte/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -9,6 +11,8 @@
 #
 
 
+EXTRA_DIST = .windows
+
 dist_pkgdata_DATA = help-ompi-dpm-orte.txt
 
 # Make the output library in this directory, and name it either
diff --git a/ompi/mca/mpool/rdma/Makefile.am b/ompi/mca/mpool/rdma/Makefile.am
index 3b151b53ca..d2912ac405 100644
--- a/ompi/mca/mpool/rdma/Makefile.am
+++ b/ompi/mca/mpool/rdma/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 AM_CPPFLAGS = $(mpool_rdma_CPPFLAGS)
 
 sources = \
diff --git a/ompi/mca/mpool/sm/Makefile.am b/ompi/mca/mpool/sm/Makefile.am
index 7b02eb2373..2cd624b6c0 100644
--- a/ompi/mca/mpool/sm/Makefile.am
+++ b/ompi/mca/mpool/sm/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
 	mpool_sm.h \
 	mpool_sm_module.c \
diff --git a/ompi/mca/osc/pt2pt/Makefile.am b/ompi/mca/osc/pt2pt/Makefile.am
index e882757e55..9685b927a7 100644
--- a/ompi/mca/osc/pt2pt/Makefile.am
+++ b/ompi/mca/osc/pt2pt/Makefile.am
@@ -3,7 +3,7 @@
 #                         All rights reserved.
 # Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
 #                         All rights reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -14,6 +14,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 pt2pt_sources = \
 	osc_pt2pt.h \
 	osc_pt2pt.c \
diff --git a/ompi/mca/osc/rdma/Makefile.am b/ompi/mca/osc/rdma/Makefile.am
index 72a87e55c8..bb15faa8b3 100644
--- a/ompi/mca/osc/rdma/Makefile.am
+++ b/ompi/mca/osc/rdma/Makefile.am
@@ -3,7 +3,7 @@
 #                         All rights reserved.
 # Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
 #                         All rights reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -14,6 +14,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 pt2pt_sources = \
 	osc_rdma.h \
 	osc_rdma.c \
diff --git a/ompi/mca/pml/cm/Makefile.am b/ompi/mca/pml/cm/Makefile.am
index e378de9dbf..21fb941706 100644
--- a/ompi/mca/pml/cm/Makefile.am
+++ b/ompi/mca/pml/cm/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -12,7 +14,7 @@
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
-EXTRA_DIST = post_configure.sh
+EXTRA_DIST = post_configure.sh .windows
 
 if OMPI_BUILD_pml_cm_DSO
 component_noinst =
diff --git a/ompi/mca/pml/dr/Makefile.am b/ompi/mca/pml/dr/Makefile.am
index 2a94eaa14f..dd8e60f2cc 100644
--- a/ompi/mca/pml/dr/Makefile.am
+++ b/ompi/mca/pml/dr/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 dr_sources  = \
 	pml_dr.c \
 	pml_dr.h \
diff --git a/ompi/mca/pml/ob1/Makefile.am b/ompi/mca/pml/ob1/Makefile.am
index 9c88ea0c34..4295eae00e 100644
--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-EXTRA_DIST = post_configure.sh pml_ob1_endpoint.c pml_ob1_endpoint.h
+EXTRA_DIST = post_configure.sh pml_ob1_endpoint.c pml_ob1_endpoint.h .windows
 
 ob1_sources  = \
 	pml_ob1.c \
diff --git a/ompi/mca/pubsub/orte/Makefile.am b/ompi/mca/pubsub/orte/Makefile.am
index 4803e735bb..83b0f072e8 100644
--- a/ompi/mca/pubsub/orte/Makefile.am
+++ b/ompi/mca/pubsub/orte/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2004-2006 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,7 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
 
 dist_pkgdata_DATA = help-ompi-pubsub-orte.txt
 
diff --git a/ompi/mca/topo/unity/Makefile.am b/ompi/mca/topo/unity/Makefile.am
index 594c202be3..d2a7222888 100644
--- a/ompi/mca/topo/unity/Makefile.am
+++ b/ompi/mca/topo/unity/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
     topo_unity.h \
     topo_unity_cart_map.c \
diff --git a/ompi/mpi/Makefile.am b/ompi/mpi/Makefile.am
index 91c33cfd54..6cf89370b7 100644
--- a/ompi/mpi/Makefile.am
+++ b/ompi/mpi/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,4 +17,6 @@
 # $HEADER$
 #
 
+EXTRA_DIST += mpi/CMakeLists.txt
+
 dist_pkgdata_DATA += mpi/help-mpi-api.txt
diff --git a/ompi/mpi/cxx/Makefile.am b/ompi/mpi/cxx/Makefile.am
index 2d34aef30c..1f5ab331bb 100644
--- a/ompi/mpi/cxx/Makefile.am
+++ b/ompi/mpi/cxx/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,6 +18,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = CMakeLists.txt
+
 # Need the first so that we can get the path names correct inside the
 # MPI C++ library.  The second is necessary so that mpi.h doesn't
 # include mpicxx.h through the incorrect pathname in any of the C++
diff --git a/ompi/mpi/f77/Makefile.am b/ompi/mpi/f77/Makefile.am
index 47247f8c9a..060b1170bc 100644
--- a/ompi/mpi/f77/Makefile.am
+++ b/ompi/mpi/f77/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = CMakeLists.txt
+
 SUBDIRS = profile
 
 #
diff --git a/ompi/tools/Makefile.am b/ompi/tools/Makefile.am
index 0f6a6c1445..6d51cd9c53 100644
--- a/ompi/tools/Makefile.am
+++ b/ompi/tools/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -19,7 +19,7 @@
 
 # This makefile.am does not stand on its own - it is included from ompi/Makefile.am
 
-EXTRA_DIST += tools/win_makefile
+EXTRA_DIST += tools/win_makefile tools/CMakeLists.txt
 
 SUBDIRS += \
 	tools/ompi_info \
diff --git a/ompi/tools/ompi-server/Makefile.am b/ompi/tools/ompi-server/Makefile.am
index 91c9b427a3..9a3eff0d66 100644
--- a/ompi/tools/ompi-server/Makefile.am
+++ b/ompi/tools/ompi-server/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = ompi-server.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if OMPI_INSTALL_BINARIES
 if !ORTE_DISABLE_FULL_SUPPORT
diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am
index 4d23a9150d..3dfc4558d8 100644
--- a/ompi/tools/ompi_info/Makefile.am
+++ b/ompi/tools/ompi_info/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -42,7 +42,7 @@ AM_CPPFLAGS = \
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = ompi_info.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if OMPI_INSTALL_BINARIES
 
diff --git a/opal/Makefile.am b/opal/Makefile.am
index 38b87f70aa..41e2e659d8 100644
--- a/opal/Makefile.am
+++ b/opal/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,7 +16,7 @@
 # $HEADER$
 #
 
-EXTRA_DIST =
+EXTRA_DIST = CMakeLists.txt
 
 SUBDIRS = \
 	include \
diff --git a/opal/event/Makefile.am b/opal/event/Makefile.am
index 8e8a925a2b..813d501446 100644
--- a/opal/event/Makefile.am
+++ b/opal/event/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -33,7 +33,9 @@ EXTRA_DIST = event.h event-internal.h evsignal.h event.3 \
 	kqueue.c epoll_sub.c epoll.c select.c poll.c signal.c \
 	devpoll.c evport.c log.h\
 	WIN32-Code/config.h WIN32-Code/misc.c \
-	WIN32-Code/misc.h  WIN32-Code/win32.c
+	WIN32-Code/misc.h  WIN32-Code/win32.c \
+	WIN32-Code/tree.h CMakeLists.txt \
+	WIN32-Code/CMakeLists.txt
 
 # OMPI: This causes problems
 junk = \
diff --git a/opal/event/compat/sys/Makefile.am b/opal/event/compat/sys/Makefile.am
index 905e20834f..309b0c1369 100644
--- a/opal/event/compat/sys/Makefile.am
+++ b/opal/event/compat/sys/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,5 +18,6 @@
 #
 
 
+EXTRA_DIST = CMakeLists.txt
 
 noinst_HEADERS = queue.h _time.h _timeradd.h
diff --git a/opal/include/Makefile.am b/opal/include/Makefile.am
index be43d739b8..6c3c24c776 100644
--- a/opal/include/Makefile.am
+++ b/opal/include/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = CMakeLists.txt
+
 headers = \
 	opal_config_bottom.h \
 	opal_stdint.h
diff --git a/opal/include/opal/sys/win32/Makefile.am b/opal/include/opal/sys/win32/Makefile.am
index 7f18abc777..df4fa4d38a 100644
--- a/opal/include/opal/sys/win32/Makefile.am
+++ b/opal/include/opal/sys/win32/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -19,4 +19,5 @@
 # This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
 
 headers += \
-	opal/sys/win32/atomic.h
+	opal/sys/win32/atomic.h \
+	opal/sys/win32/timer.h
diff --git a/opal/mca/backtrace/none/Makefile.am b/opal/mca/backtrace/none/Makefile.am
index 5b899bee9d..696ced0f52 100644
--- a/opal/mca/backtrace/none/Makefile.am
+++ b/opal/mca/backtrace/none/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 noinst_LTLIBRARIES = libmca_backtrace_none.la
 
 libmca_backtrace_none_la_SOURCES = \
diff --git a/opal/mca/carto/auto_detect/Makefile.am b/opal/mca/carto/auto_detect/Makefile.am
index 485d950db6..f139352127 100644
--- a/opal/mca/carto/auto_detect/Makefile.am
+++ b/opal/mca/carto/auto_detect/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         carto_auto_detect.h \
         carto_auto_detect_component.c \
diff --git a/opal/mca/crs/none/Makefile.am b/opal/mca/crs/none/Makefile.am
index 34a2358b88..3239e71ea5 100644
--- a/opal/mca/crs/none/Makefile.am
+++ b/opal/mca/crs/none/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2004-2008 The Trustees of Indiana University.
 #                         All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 AM_CPPFLAGS = \
     $(LTDLINCL)
 
diff --git a/opal/mca/installdirs/config/Makefile.am b/opal/mca/installdirs/config/Makefile.am
index eea1e9c65f..6716adbdbf 100644
--- a/opal/mca/installdirs/config/Makefile.am
+++ b/opal/mca/installdirs/config/Makefile.am
@@ -2,6 +2,8 @@
 # Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
 # Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -9,6 +11,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 noinst_LTLIBRARIES = libmca_installdirs_config.la
 
 libmca_installdirs_config_la_SOURCES = \
diff --git a/opal/mca/installdirs/env/Makefile.am b/opal/mca/installdirs/env/Makefile.am
index 7851f0a8be..e0b7a83c4d 100644
--- a/opal/mca/installdirs/env/Makefile.am
+++ b/opal/mca/installdirs/env/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
 #                         reserved. 
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 noinst_LTLIBRARIES = libmca_installdirs_env.la
 
 libmca_installdirs_env_la_SOURCES = \
diff --git a/opal/mca/installdirs/windows/Makefile.am b/opal/mca/installdirs/windows/Makefile.am
index 0a418bdd2d..fdba4af560 100644
--- a/opal/mca/installdirs/windows/Makefile.am
+++ b/opal/mca/installdirs/windows/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2004-2007 The Trustees of the University of Tennessee.
 #                         All rights reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 noinst_LTLIBRARIES = libmca_installdirs_windows.la
 
 libmca_installdirs_windows_la_SOURCES = \
diff --git a/opal/mca/maffinity/first_use/Makefile.am b/opal/mca/maffinity/first_use/Makefile.am
index a8814db39e..bee18cba67 100644
--- a/opal/mca/maffinity/first_use/Makefile.am
+++ b/opal/mca/maffinity/first_use/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         maffinity_first_use.h \
         maffinity_first_use_component.c \
diff --git a/opal/mca/paffinity/windows/Makefile.am b/opal/mca/paffinity/windows/Makefile.am
index dc186e4877..7650fa78f7 100644
--- a/opal/mca/paffinity/windows/Makefile.am
+++ b/opal/mca/paffinity/windows/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         paffinity_windows.h \
         paffinity_windows_component.c \
diff --git a/opal/tools/Makefile.am b/opal/tools/Makefile.am
index 8670b80f21..3ef6dbfbf4 100644
--- a/opal/tools/Makefile.am
+++ b/opal/tools/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST += tools/CMakeLists.txt
+
 # This makefile.am does not stand on its own - it is included from
 # opal/Makefile.am
 
diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am
index 96bc6c3f8a..bc63f1f408 100644
--- a/opal/tools/opal-checkpoint/Makefile.am
+++ b/opal/tools/opal-checkpoint/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = opal-checkpoint.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if OMPI_INSTALL_BINARIES
 
diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am
index 22303064f0..e9161bdf25 100644
--- a/opal/tools/opal-restart/Makefile.am
+++ b/opal/tools/opal-restart/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = opal-restart.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if OMPI_INSTALL_BINARIES
 
diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am
index 708485ab95..a1e0c763e2 100644
--- a/opal/tools/wrappers/Makefile.am
+++ b/opal/tools/wrappers/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2006 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 DEFS="-DEXEEXT=\"$(EXEEXT)\""
 
 real_man_pages = generic_wrapper.1 opal_wrapper.1
-EXTRA_DIST = $(real_man_pages:.1=.1in)
+EXTRA_DIST = $(real_man_pages:.1=.1in) CMakeLists.txt
 
 include $(top_srcdir)/Makefile.man-page-rules
 
diff --git a/orte/Makefile.am b/orte/Makefile.am
index 7df9c6f510..0371f9835b 100644
--- a/orte/Makefile.am
+++ b/orte/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -57,7 +57,7 @@ ortedir = $(includedir)
 endif
 
 # setup to catch extra files to be included in tarballs
-EXTRA_DIST = 
+EXTRA_DIST = CMakeLists.txt
 
 include runtime/Makefile.am
 include util/Makefile.am
diff --git a/orte/mca/errmgr/default/Makefile.am b/orte/mca/errmgr/default/Makefile.am
index a32c8bbf1e..80c0a588fe 100644
--- a/orte/mca/errmgr/default/Makefile.am
+++ b/orte/mca/errmgr/default/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         errmgr_default.h \
 	errmgr_default_component.c \
diff --git a/orte/mca/ess/env/Makefile.am b/orte/mca/ess/env/Makefile.am
index 73491cad02..44107db331 100644
--- a/orte/mca/ess/env/Makefile.am
+++ b/orte/mca/ess/env/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         ess_env.h \
         ess_env_component.c \
diff --git a/orte/mca/ess/hnp/Makefile.am b/orte/mca/ess/hnp/Makefile.am
index 4cf3a2c567..457c33f2ae 100644
--- a/orte/mca/ess/hnp/Makefile.am
+++ b/orte/mca/ess/hnp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         ess_hnp.h \
         ess_hnp_component.c \
diff --git a/orte/mca/ess/singleton/Makefile.am b/orte/mca/ess/singleton/Makefile.am
index c0c1f65ceb..86e8de0d59 100644
--- a/orte/mca/ess/singleton/Makefile.am
+++ b/orte/mca/ess/singleton/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         ess_singleton.h \
         ess_singleton_component.c \
diff --git a/orte/mca/grpcomm/basic/Makefile.am b/orte/mca/grpcomm/basic/Makefile.am
index 71d3119482..f01c031308 100644
--- a/orte/mca/grpcomm/basic/Makefile.am
+++ b/orte/mca/grpcomm/basic/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
         grpcomm_basic.h \
 	grpcomm_basic_module.c \
diff --git a/orte/mca/iof/hnp/Makefile.am b/orte/mca/iof/hnp/Makefile.am
index a7df9d1d63..3398c255ef 100644
--- a/orte/mca/iof/hnp/Makefile.am
+++ b/orte/mca/iof/hnp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
diff --git a/orte/mca/iof/orted/Makefile.am b/orte/mca/iof/orted/Makefile.am
index 11ae547cf8..7c38b5226d 100644
--- a/orte/mca/iof/orted/Makefile.am
+++ b/orte/mca/iof/orted/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
diff --git a/orte/mca/iof/tool/Makefile.am b/orte/mca/iof/tool/Makefile.am
index 49142e9640..1cd68d1bcc 100644
--- a/orte/mca/iof/tool/Makefile.am
+++ b/orte/mca/iof/tool/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
diff --git a/orte/mca/odls/process/Makefile.am b/orte/mca/odls/process/Makefile.am
index 230d5678e8..5b68695a27 100755
--- a/orte/mca/odls/process/Makefile.am
+++ b/orte/mca/odls/process/Makefile.am
@@ -2,6 +2,8 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
@@ -10,6 +12,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 dist_pkgdata_DATA = help-odls-process.txt
 
 sources = \
diff --git a/orte/mca/oob/tcp/Makefile.am b/orte/mca/oob/tcp/Makefile.am
index 191e53d048..3c5dfbe561 100644
--- a/orte/mca/oob/tcp/Makefile.am
+++ b/orte/mca/oob/tcp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
     oob_tcp.c \
     oob_tcp.h \
diff --git a/orte/mca/plm/base/Makefile.am b/orte/mca/plm/base/Makefile.am
index da79a73234..265963cd40 100644
--- a/orte/mca/plm/base/Makefile.am
+++ b/orte/mca/plm/base/Makefile.am
@@ -5,10 +5,11 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -16,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = base/.windows
+
 headers += \
         base/base.h
 
diff --git a/orte/mca/plm/ccp/Makefile.am b/orte/mca/plm/ccp/Makefile.am
index edcf299498..99cb4ac6b6 100644
--- a/orte/mca/plm/ccp/Makefile.am
+++ b/orte/mca/plm/ccp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 AM_CPPFLAGS = $(plm_ccp_CPPFLAGS)
 
 dist_pkgdata_DATA = help-plm-ccp.txt
diff --git a/orte/mca/ras/ccp/Makefile.am b/orte/mca/ras/ccp/Makefile.am
index e8ec7e1a42..805499ad12 100644
--- a/orte/mca/ras/ccp/Makefile.am
+++ b/orte/mca/ras/ccp/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 AM_CPPFLAGS = $(ras_ccp_CPPFLAGS)
 
 sources = \
diff --git a/orte/mca/rmaps/round_robin/Makefile.am b/orte/mca/rmaps/round_robin/Makefile.am
index 43d5add487..27877eaab9 100644
--- a/orte/mca/rmaps/round_robin/Makefile.am
+++ b/orte/mca/rmaps/round_robin/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 dist_pkgdata_DATA = help-orte-rmaps-rr.txt
 
 sources = \
diff --git a/orte/mca/rmaps/seq/Makefile.am b/orte/mca/rmaps/seq/Makefile.am
index 7f98ce6318..4445407be3 100644
--- a/orte/mca/rmaps/seq/Makefile.am
+++ b/orte/mca/rmaps/seq/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 dist_pkgdata_DATA = help-orte-rmaps-seq.txt
 
 sources = \
diff --git a/orte/mca/rmaps/topo/Makefile.am b/orte/mca/rmaps/topo/Makefile.am
index 46773668dc..d8e7d03a6b 100644
--- a/orte/mca/rmaps/topo/Makefile.am
+++ b/orte/mca/rmaps/topo/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 dist_pkgdata_DATA = help-orte-rmaps-topo.txt
 
 sources = \
diff --git a/orte/mca/rml/ftrm/Makefile.am b/orte/mca/rml/ftrm/Makefile.am
index f71a74aa00..4b73495d28 100644
--- a/orte/mca/rml/ftrm/Makefile.am
+++ b/orte/mca/rml/ftrm/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
     rml_ftrm.h \
     rml_ftrm_component.c \
diff --git a/orte/mca/rml/oob/Makefile.am b/orte/mca/rml/oob/Makefile.am
index 8211d1feeb..09095faed2 100644
--- a/orte/mca/rml/oob/Makefile.am
+++ b/orte/mca/rml/oob/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -16,6 +16,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
 	rml_oob.h \
 	rml_oob_component.c \
diff --git a/orte/mca/routed/binomial/Makefile.am b/orte/mca/routed/binomial/Makefile.am
index 00ae149723..17c234ef09 100644
--- a/orte/mca/routed/binomial/Makefile.am
+++ b/orte/mca/routed/binomial/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2007      Los Alamos National Security, LLC.
 #                         All rights reserved. 
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
 	routed_binomial.h \
 	routed_binomial.c \
diff --git a/orte/mca/routed/linear/Makefile.am b/orte/mca/routed/linear/Makefile.am
index 0665a6e3ce..0a5652c7d7 100644
--- a/orte/mca/routed/linear/Makefile.am
+++ b/orte/mca/routed/linear/Makefile.am
@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2007      Los Alamos National Security, LLC.
 #                         All rights reserved. 
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -8,6 +10,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = .windows
+
 sources = \
 	routed_linear.h \
 	routed_linear.c \
diff --git a/orte/tools/Makefile.am b/orte/tools/Makefile.am
index e538840611..18d78f87d7 100644
--- a/orte/tools/Makefile.am
+++ b/orte/tools/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,6 +18,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST += tools/CMakeLists.txt
+
 # This makefile.am does not stand on its own - it is included from
 # orte/Makefile.am
 
diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am
index f97d02c860..f151f3c0f5 100644
--- a/orte/tools/orte-checkpoint/Makefile.am
+++ b/orte/tools/orte-checkpoint/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orte-checkpoint.1
-EXTRA_DIST = orte-checkpoint.1in
+EXTRA_DIST = orte-checkpoint.1in CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if WANT_FT
diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am
index 635af6b96d..58bce9d3d3 100644
--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orte-clean.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am
index 613d056d57..4d53ac2731 100644
--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orte-ps.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am
index afff35223b..fb26d6856e 100644
--- a/orte/tools/orte-restart/Makefile.am
+++ b/orte/tools/orte-restart/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orte-restart.1
-EXTRA_DIST = orte-restart.1in
+EXTRA_DIST = orte-restart.1in CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if WANT_FT
diff --git a/orte/tools/orted/Makefile.am b/orte/tools/orted/Makefile.am
index 050a710804..a2955c4e41 100644
--- a/orte/tools/orted/Makefile.am
+++ b/orte/tools/orted/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -21,7 +21,7 @@
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orted.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am
index e2450a1170..1c34ef11fd 100644
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -30,7 +30,7 @@ CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(TOTALVIEW_DEBUG_FLAGS)
 include $(top_srcdir)/Makefile.man-page-rules
 
 man_pages = orterun.1
-EXTRA_DIST = $(man_pages:.1=.1in)
+EXTRA_DIST = $(man_pages:.1=.1in) CMakeLists.txt
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
diff --git a/test/Makefile.am b/test/Makefile.am
index 404e2491d8..78143ab127 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+EXTRA_DIST = CMakeLists.txt
+
 # support needs to be first for dependencies
 SUBDIRS = support asm class threads peruse datatype
 DIST_SUBDIRS = event $(SUBDIRS)
diff --git a/test/mpi/Makefile.am b/test/mpi/Makefile.am
index ab1ef93c3a..22ffa74b37 100644
--- a/test/mpi/Makefile.am
+++ b/test/mpi/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -18,5 +18,6 @@
 #
 
 
+EXTRA_DIST = CMakeLists.txt
 
 SUBDIRS = environment
diff --git a/test/mpi/environment/Makefile.am b/test/mpi/environment/Makefile.am
index 0793da3290..a17236ed75 100644
--- a/test/mpi/environment/Makefile.am
+++ b/test/mpi/environment/Makefile.am
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2005 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
@@ -17,7 +17,7 @@
 # $HEADER$
 #
 
-
+EXTRA_DIST = CMakeLists.txt
 
 AM_LDFLAGS = -lpthread