diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a2de6edd82..f3c0fb30f7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -60,4 +60,9 @@ EXTRA_DIST = \
         platform/lanl/tlcc/optimized-panasas \
         platform/lanl/tlcc/optimized.conf \
         platform/lanl/tlcc/optimized-nopanasas.conf \
-        platform/lanl/tlcc/optimized-panasas.conf
+        platform/lanl/tlcc/optimized-panasas.conf \
+        platform/embedded/debug \
+        platform/embedded/optimized \
+        platform/embedded/build_embedded.sh \
+        platform/embedded/gen_embedded.sh
+
diff --git a/contrib/platform/embedded/build_embedded.sh b/contrib/platform/embedded/build_embedded.sh
new file mode 100755
index 0000000000..c2e0524939
--- /dev/null
+++ b/contrib/platform/embedded/build_embedded.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash 
+#
+
+if (( $# < 2 )) ; then
+    echo "usage ./contrib/platform/embedded/build_embedded.sh prefix debug|optimized"
+    exit 1
+fi
+
+prefix=$1
+shift 1
+platform=$1
+
+./configure --prefix="${prefix}" --with-platform=contrib/platform/embedded/"${platform}"
+make clean > /dev/null
+make -j2 all > /dev/null
+make -j2 install > /dev/null
+
+# All done
+exit 0
diff --git a/contrib/platform/embedded/debug b/contrib/platform/embedded/debug
new file mode 100644
index 0000000000..97d8e4c03f
--- /dev/null
+++ b/contrib/platform/embedded/debug
@@ -0,0 +1,31 @@
+enable_dlopen=no
+enable_mem_debug=yes
+enable_memchecker=no
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=yes
+enable_static=yes
+enable_ipv6=no
+enable_mpi_f77=no
+enable_mpi_f90=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_ft_thread=no
+enable_per_user_config_files=no
+enable_mca_no_build=crs,carto,maffinity,paffinity,pstat,filem,grpcomm-basic,grpcomm-hier,rmaps-rank_file,rmaps-seq,rmaps-topo,routed-binomial,routed-linear,routed-radix,routed-slave,snapc
+enable_contrib_no_build=libnbc,vt
+with_devel_headers=yes
+with_alps=no
+with_ftb=no
+with_sge=no
+with_loadleveler=no
+with_xgrid=no
+with_slurm=no
+with_tm=no
+with_lsf=no
+with_threads=posix
diff --git a/contrib/platform/embedded/gen_embedded.sh b/contrib/platform/embedded/gen_embedded.sh
new file mode 100755
index 0000000000..c30b2ead69
--- /dev/null
+++ b/contrib/platform/embedded/gen_embedded.sh
@@ -0,0 +1,20 @@
+#! /usr/bin/env bash 
+#
+
+if (( $# < 2 )) ; then
+    echo "usage ./contrib/platform/embedded/gen_embedded.sh prefix debug|optimized"
+    exit 1
+fi
+
+prefix=$1
+shift 1
+platform=$1
+
+./autogen.sh -l -no-ompi
+./configure --prefix="${prefix}" --with-platform=contrib/platform/embedded/"${platform}"
+make clean > /dev/null
+make -j2 all > /dev/null
+make -j2 install > /dev/null
+
+# All done
+exit 0
diff --git a/contrib/platform/embedded/optimized b/contrib/platform/embedded/optimized
new file mode 100644
index 0000000000..876c31e8ba
--- /dev/null
+++ b/contrib/platform/embedded/optimized
@@ -0,0 +1,31 @@
+enable_dlopen=no
+enable_mem_debug=no
+enable_memchecker=no
+enable_mem_profile=no
+enable_debug_symbols=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=no
+enable_shared=yes
+enable_static=no
+enable_ipv6=no
+enable_mpi_f77=no
+enable_mpi_f90=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+enable_ft_thread=no
+enable_per_user_config_files=no
+enable_mca_no_build=crs,carto,maffinity,paffinity,pstat,filem,grpcomm-basic,grpcomm-hier,rmaps-rank_file,rmaps-seq,rmaps-topo,routed-binomial,routed-linear,routed-radix,routed-slave,snapc
+enable_contrib_no_build=libnbc,vt
+with_devel_headers=yes
+with_alps=no
+with_ftb=no
+with_sge=no
+with_loadleveler=no
+with_xgrid=no
+with_slurm=no
+with_tm=no
+with_lsf=no
+with_threads=posix
diff --git a/contrib/platform/lanl/rr-class/slave b/contrib/platform/lanl/rr-class/slave
index 5f01e2c39a..e522b0f517 100644
--- a/contrib/platform/lanl/rr-class/slave
+++ b/contrib/platform/lanl/rr-class/slave
@@ -16,6 +16,7 @@ enable_mpi_cxx_seek=yes
 enable_cxx_exceptions=no
 enable_ft_thread=no
 enable_per_user_config_files=no
+enable_script_wrapper_compilers=yes
 enable_mca_no_build=crs,routed-linear,routed-radix,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm
 enable_contrib_no_build=libnbc,vt
 with_tm=no