diff --git a/contrib/platform/cray_xt3_romio b/contrib/platform/cray_xt3_romio
deleted file mode 100755
index 0f0be77456..0000000000
--- a/contrib/platform/cray_xt3_romio
+++ /dev/null
@@ -1,109 +0,0 @@
-enable_io_romio=yes
-enable_static=yes
-enable_shared=no
-with_threads=no
-enable_pretty_print_stacktrace=no
-enable_dlopen=no
-with_portals_config=redstorm
-with_memory_manager=none
-enable_mca_no_build=carto-file,maffinity,paffinity,timer,errmgr,iof,odls,oob,plm,ras,rmaps,rml,routed,filem,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,libnbc,vt
-with_rte_support=no
-enable_heterogeneous=no
-enable_pty_support=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_debug_symbols=no
-enable_binaries=no
-
-ompi_cv_f77_sizeof_LOGICAL=${ompi_cv_f77_sizeof_LOGICAL=4}
-ompi_cv_f77_alignment_LOGICAL=${ompi_cv_f77_alignment_LOGICAL=4}
-ompi_cv_f77_sizeof_LOGICALp1=${ompi_cv_f77_sizeof_LOGICALp1=1}
-ompi_cv_f77_alignment_LOGICALp1=${ompi_cv_f77_alignment_LOGICALp1=1}
-ompi_cv_f77_sizeof_LOGICALp2=${ompi_cv_f77_sizeof_LOGICALp2=2}
-ompi_cv_f77_alignment_LOGICALp2=${ompi_cv_f77_alignment_LOGICALp2=2}
-ompi_cv_f77_sizeof_LOGICALp4=${ompi_cv_f77_sizeof_LOGICALp4=4}
-ompi_cv_f77_alignment_LOGICALp4=${ompi_cv_f77_alignment_LOGICALp4=4}
-ompi_cv_f77_sizeof_LOGICALp8=${ompi_cv_f77_sizeof_LOGICALp8=8}
-ompi_cv_f77_alignment_LOGICALp8=${ompi_cv_f77_alignment_LOGICALp8=8}
-ompi_cv_f77_sizeof_INTEGER=${ompi_cv_f77_sizeof_INTEGER=4}
-ompi_cv_f77_alignment_INTEGER=${ompi_cv_f77_alignment_INTEGER=4}
-ompi_cv_f77_sizeof_INTEGERp1=${ompi_cv_f77_sizeof_INTEGERp1=1}
-ompi_cv_f77_alignment_INTEGERp1=${ompi_cv_f77_alignment_INTEGERp1=1}
-ompi_cv_f77_sizeof_INTEGERp2=${ompi_cv_f77_sizeof_INTEGERp2=2}
-ompi_cv_f77_alignment_INTEGERp2=${ompi_cv_f77_alignment_INTEGERp2=2}
-ompi_cv_f77_sizeof_INTEGERp4=${ompi_cv_f77_sizeof_INTEGERp4=4}
-ompi_cv_f77_alignment_INTEGERp4=${ompi_cv_f77_alignment_INTEGERp4=4}
-ompi_cv_f77_sizeof_INTEGERp8=${ompi_cv_f77_sizeof_INTEGERp8=8}
-ompi_cv_f77_alignment_INTEGERp8=${ompi_cv_f77_alignment_INTEGERp8=8}
-ompi_cv_f77_sizeof_INTEGERp16=${ompi_cv_f77_sizeof_INTEGERp16=16}
-ompi_cv_f77_alignment_INTEGERp16=${ompi_cv_f77_alignment_INTEGERp16=8}
-ompi_cv_f77_sizeof_REAL=${ompi_cv_f77_sizeof_REAL=4}
-ompi_cv_f77_alignment_REAL=${ompi_cv_f77_alignment_REAL=4}
-ompi_cv_f77_sizeof_REALp2=${ompi_cv_f77_sizeof_REALp2=2}
-ompi_cv_f77_alignment_REALp2=${ompi_cv_f77_alignment_REALp2=2}
-ompi_cv_f77_sizeof_REALp4=${ompi_cv_f77_sizeof_REALp4=4}
-ompi_cv_f77_alignment_REALp4=${ompi_cv_f77_alignment_REALp4=4}
-ompi_cv_f77_sizeof_REALp8=${ompi_cv_f77_sizeof_REALp8=8}
-ompi_cv_f77_alignment_REALp8=${ompi_cv_f77_alignment_REALp8=8}
-ompi_cv_f77_sizeof_REALp16=${ompi_cv_f77_sizeof_REALp16=16}
-ompi_cv_f77_alignment_REALp16=${ompi_cv_f77_alignment_REALp16=8}
-ompi_cv_f77_sizeof_DOUBLE_PRECISION=${ompi_cv_f77_sizeof_DOUBLE_PRECISION=8}
-ompi_cv_f77_alignment_DOUBLE_PRECISION=${ompi_cv_f77_alignment_DOUBLE_PRECISION=8}
-ompi_cv_f77_sizeof_COMPLEX=${ompi_cv_f77_sizeof_COMPLEX=8}
-ompi_cv_f77_alignment_COMPLEX=${ompi_cv_f77_alignment_COMPLEX=4}
-ompi_cv_f77_sizeof_COMPLEXp8=${ompi_cv_f77_sizeof_COMPLEXp8=8}
-ompi_cv_f77_alignment_COMPLEXp8=${ompi_cv_f77_alignment_COMPLEXp8=4}
-ompi_cv_f77_sizeof_COMPLEXp16=${ompi_cv_f77_sizeof_COMPLEXp16=16}
-ompi_cv_f77_alignment_COMPLEXp16=${ompi_cv_f77_alignment_COMPLEXp16=8}
-ompi_cv_f77_sizeof_COMPLEXp32=${ompi_cv_f77_sizeof_COMPLEXp32=32}
-ompi_cv_f77_alignment_COMPLEXp32=${ompi_cv_f77_alignment_COMPLEXp32=8}
-ompi_cv_f77_true_value=${ompi_cv_f77_true_value=-1}
-
-
-ompi_cv_f90_sizeof_LOGICAL=${ompi_cv_f90_sizeof_LOGICAL=4}
-ompi_cv_f90_alignment_LOGICAL=${ompi_cv_f90_alignment_LOGICAL=4}
-ompi_cv_f90_sizeof_LOGICALp1=${ompi_cv_f90_sizeof_LOGICALp1=1}
-ompi_cv_f90_alignment_LOGICALp1=${ompi_cv_f90_alignment_LOGICALp1=1}
-ompi_cv_f90_sizeof_LOGICALp2=${ompi_cv_f90_sizeof_LOGICALp2=2}
-ompi_cv_f90_alignment_LOGICALp2=${ompi_cv_f90_alignment_LOGICALp2=2}
-ompi_cv_f90_sizeof_LOGICALp4=${ompi_cv_f90_sizeof_LOGICALp4=4}
-ompi_cv_f90_alignment_LOGICALp4=${ompi_cv_f90_alignment_LOGICALp4=4}
-ompi_cv_f90_sizeof_LOGICALp8=${ompi_cv_f90_sizeof_LOGICALp8=8}
-ompi_cv_f90_alignment_LOGICALp8=${ompi_cv_f90_alignment_LOGICALp8=8}
-ompi_cv_f90_sizeof_INTEGER=${ompi_cv_f90_sizeof_INTEGER=4}
-ompi_cv_f90_alignment_INTEGER=${ompi_cv_f90_alignment_INTEGER=4}
-ompi_cv_f90_sizeof_INTEGERp1=${ompi_cv_f90_sizeof_INTEGERp1=1}
-ompi_cv_f90_alignment_INTEGERp1=${ompi_cv_f90_alignment_INTEGERp1=1}
-ompi_cv_f90_sizeof_INTEGERp2=${ompi_cv_f90_sizeof_INTEGERp2=2}
-ompi_cv_f90_alignment_INTEGERp2=${ompi_cv_f90_alignment_INTEGERp2=2}
-ompi_cv_f90_sizeof_INTEGERp4=${ompi_cv_f90_sizeof_INTEGERp4=4}
-ompi_cv_f90_alignment_INTEGERp4=${ompi_cv_f90_alignment_INTEGERp4=4}
-ompi_cv_f90_sizeof_INTEGERp8=${ompi_cv_f90_sizeof_INTEGERp8=8}
-ompi_cv_f90_alignment_INTEGERp8=${ompi_cv_f90_alignment_INTEGERp8=8}
-ompi_cv_f90_sizeof_INTEGERp16=${ompi_cv_f90_sizeof_INTEGERp16=16}
-ompi_cv_f90_alignment_INTEGERp16=${ompi_cv_f90_alignment_INTEGERp16=8}
-ompi_cv_f90_sizeof_REAL=${ompi_cv_f90_sizeof_REAL=4}
-ompi_cv_f90_alignment_REAL=${ompi_cv_f90_alignment_REAL=4}
-ompi_cv_f90_sizeof_REALp2=${ompi_cv_f90_sizeof_REALp2=2}
-ompi_cv_f90_alignment_REALp2=${ompi_cv_f90_alignment_REALp2=2}
-ompi_cv_f90_sizeof_REALp4=${ompi_cv_f90_sizeof_REALp4=4}
-ompi_cv_f90_alignment_REALp4=${ompi_cv_f90_alignment_REALp4=4}
-ompi_cv_f90_sizeof_REALp8=${ompi_cv_f90_sizeof_REALp8=8}
-ompi_cv_f90_alignment_REALp8=${ompi_cv_f90_alignment_REALp8=8}
-ompi_cv_f90_sizeof_REALp16=${ompi_cv_f90_sizeof_REALp16=16}
-ompi_cv_f90_alignment_REALp16=${ompi_cv_f90_alignment_REALp16=8}
-ompi_cv_f90_sizeof_DOUBLE_PRECISION=${ompi_cv_f90_sizeof_DOUBLE_PRECISION=8}
-ompi_cv_f90_alignment_DOUBLE_PRECISION=${ompi_cv_f90_alignment_DOUBLE_PRECISION=8}
-ompi_cv_f90_sizeof_COMPLEX=${ompi_cv_f90_sizeof_COMPLEX=8}
-ompi_cv_f90_alignment_COMPLEX=${ompi_cv_f90_alignment_COMPLEX=4}
-ompi_cv_f90_sizeof_COMPLEXp8=${ompi_cv_f90_sizeof_COMPLEXp8=8}
-ompi_cv_f90_alignment_COMPLEXp8=${ompi_cv_f90_alignment_COMPLEXp8=4}
-ompi_cv_f90_sizeof_COMPLEXp16=${ompi_cv_f90_sizeof_COMPLEXp16=16}
-ompi_cv_f90_alignment_COMPLEXp16=${ompi_cv_f90_alignment_COMPLEXp16=8}
-ompi_cv_f90_sizeof_COMPLEXp32=${ompi_cv_f90_sizeof_COMPLEXp32=32}
-ompi_cv_f90_alignment_COMPLEXp32=${ompi_cv_f90_alignment_COMPLEXp32=8}
-ompi_cv_f90_true_value=${ompi_cv_f90_true_value=-1}
-ompi_cv_f90_sizeof_DOUBLE_COMPLEX=${ompi_cv_f90_sizeof_DOUBLE_COMPLEX=16}
-ompi_cv_f90_alignment_DOUBLE_COMPLEX=${ompi_cv_f90_alignment_DOUBLE_COMPLEX=8}
-ompi_cv_f90_int_kind_9=${ompi_cv_f90_int_kind_9=4}
-ompi_cv_f90_int_kind_18=${ompi_cv_f90_int_kind_18=8}
diff --git a/contrib/platform/cray_xt3_romio b/contrib/platform/cray_xt3_romio
new file mode 120000
index 0000000000..6bfcefad3c
--- /dev/null
+++ b/contrib/platform/cray_xt3_romio
@@ -0,0 +1 @@
+redstorm
\ No newline at end of file
diff --git a/contrib/platform/redstorm b/contrib/platform/redstorm
index e264111d2d..26f74388c7 100644
--- a/contrib/platform/redstorm
+++ b/contrib/platform/redstorm
@@ -1,4 +1,4 @@
-enable_io_romio=no
+enable_io_romio=yes
 enable_static=yes
 enable_shared=no
 with_threads=no
@@ -6,7 +6,8 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
-enable_mca_no_build=carto-file,maffinity,paffinity,timer,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,libnbc,vt
+enable_mca_no_build=carto-file,maffinity,paffinity,timer,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr
+enable_contrib_no_build=libnbc,vt
 with_rte_support=no
 enable_heterogeneous=no
 enable_pty_support=no
@@ -14,6 +15,7 @@ enable_mem_debug=no
 enable_mem_profile=no
 enable_debug_symbols=no
 enable_binaries=no
+enable_script_wrapper_compilers=yes
 
 ompi_cv_f77_sizeof_LOGICAL=${ompi_cv_f77_sizeof_LOGICAL=4}
 ompi_cv_f77_alignment_LOGICAL=${ompi_cv_f77_alignment_LOGICAL=4}