diff --git a/cmake/LibMPI.cmake b/cmake/LibMPI.cmake
index 27c2683be..f5a4d5f35 100644
--- a/cmake/LibMPI.cmake
+++ b/cmake/LibMPI.cmake
@@ -47,7 +47,9 @@ function (platform_name RETURN_VARIABLE)
 
   # wcoss2
   elseif (SITENAME MATCHES "^along01" OR
-      SITENAME MATCHES "^alogin02")
+      SITENAME MATCHES "^alogin02" OR
+      SITENAME MATCHES "^clogin" OR
+      SITENAME MATCHES "^dlogin")
 
     set (${RETURN_VARIABLE} "wcoss2" PARENT_SCOPE)
 
diff --git a/cmake/mpiexec.wcoss2 b/cmake/mpiexec.wcoss2
new file mode 100755
index 000000000..1365ad45d
--- /dev/null
+++ b/cmake/mpiexec.wcoss2
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Arguments:
+#
+#   $1  - Number of MPI Tasks
+#   $2+ - Executable and its arguments
+#
+
+ACCOUNT=GFS-DEV
+QUEUE=dev
+
+NP=$1
+shift
+
+qsub -A $ACCOUNT -q $QUEUE -l select=1:ncpus=$NP:mem=1GB -l place=vscatter -l walltime=00:10:00 $@