diff --git a/configure.ac b/configure.ac
index 08422d5935..b5b4022f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1381,6 +1381,7 @@ AC_CONFIG_FILES([
     src/include/sys/ia64/Makefile
     src/include/sys/powerpc/Makefile
     src/include/sys/sparc64/Makefile
+    src/include/sys/win32/Makefile
 
     src/class/Makefile
     src/runtime/Makefile
diff --git a/src/include/sys/Makefile.am b/src/include/sys/Makefile.am
index e0c41ca852..c226657bf5 100644
--- a/src/include/sys/Makefile.am
+++ b/src/include/sys/Makefile.am
@@ -14,9 +14,9 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS = alpha amd64 ia32 ia64 powerpc sparc64
+SUBDIRS = alpha amd64 ia32 ia64 powerpc sparc64 win32
 
-noinst_HEADERS = atomic.h cache.h
+noinst_HEADERS = atomic.h architecture.h atomic_impl.h
 
 # Conditionally install the header files
 
diff --git a/src/include/sys/win32/Makefile.am b/src/include/sys/win32/Makefile.am
new file mode 100644
index 0000000000..25f62eea7b
--- /dev/null
+++ b/src/include/sys/win32/Makefile.am
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         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, 
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+noinst_HEADERS = atomic.h 
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/include/sys/win32
+ompi_HEADERS = $(noinst_HEADERS)
+else
+ompidir = $(includedir)
+endif