diff --git a/AllwmakeLibccmio b/AllwmakeLibccmio
deleted file mode 100755
index 87330ee..0000000
--- a/AllwmakeLibccmio
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     AllwmakeLibccmio
-#
-# Description
-#     Build CD-adapco's ccmio library
-#
-#------------------------------------------------------------------------------
-packageDir=libccmio-2.6.1
-
-#------------------------------------------------------------------------------
-# run from third-party directory only
-cd ${0%/*} || exit 1
-wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
-    echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
-    echo "    The environment variables are inconsistent with the installation."
-    echo "    Check the OpenFOAM entries in your dot-files and source them."
-    exit 1
-}
-. etc/tools/ThirdPartyFunctions
-#------------------------------------------------------------------------------
-
-usage()
-{
-    cat<<USAGE
-
-* The license of the libccmio library is proprietary:
-
-    Users wishing to make use of its functionality should contact CD-Adapco
-    for possible download and terms of use.
-
-
-Usage: ${0##*/}
-
-* This script will install the libccmio library
-* After obtaining the $packageDir library, place in folder
-
-    $WM_THIRD_PARTY_DIR/$packageDir/
-
-USAGE
-    exit 1
-}
-
-
-# get tar.gz file if required
-if [ ! -d ${packageDir} ]
-then
-    usage
-fi
-
-set -x
-
-# make libccmio
-(
-    cd $packageDir || exit 1
-    cpMakeFiles libccmio
-
-    wmake libso
-)
-
-
-#------------------------------------------------------------------------------
diff --git a/README.org b/README.org
index 9129eb3..551b2df 100644
--- a/README.org
+++ b/README.org
@@ -9,14 +9,14 @@
 
 * Description
   Scripts for building third-party packages.
-* Order of execution:
+* Build Order:
   + makeGcc   (recommended if the system gcc is < 4.7)
   + Allwmake  (Builds OpenMPI, Scotch etc.)
   + makeCmake (if the system cmake version is < 2.8.8)
   + makeParaView
-*** Optional
-    + AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes)
-    + Allclean (Only required to save disk space)
+*** Optional Build Components:
+    + makeCCMIO (Only required for conversion of STAR-CCM+ meshes)
+    + Allclean  (Only required to save disk space)
 * Versions and locations to download the third party packages
 *** Gcc C++ Compiler
     The minimum version of gcc required is 4.5.0
diff --git a/etc/wmakeFiles/libccmio/files b/etc/wmakeFiles/libccmio/files
new file mode 100644
index 0000000..f4e9ca6
--- /dev/null
+++ b/etc/wmakeFiles/libccmio/files
@@ -0,0 +1,27 @@
+/* NOTE: make any changes to this file in etc/wmakeFiles/ */
+
+adf = libadf
+$(adf)/ADF_fortran_2_c.c
+$(adf)/ADF_interface.c
+$(adf)/ADF_internals.c
+
+ccmio = libccmio
+$(ccmio)/ccmio.c
+$(ccmio)/ccmiocore.c
+$(ccmio)/ccmioprivate.c
+$(ccmio)/ccmioutility.c
+$(ccmio)/ccmioversion.c
+
+/*
+ * the cgns library is not used by ccmio
+ * retain for documentation purposes only
+ *
+ cgns = libcgns
+ $(cgns)/adf_cond.c
+ $(cgns)/adf_ftoc.c
+ $(cgns)/cgns_error.c
+ $(cgns)/cgns_internals.c
+ $(cgns)/cgnslib.c
+*/
+
+LIB = $(FOAM_EXT_LIBBIN)/libccmio
diff --git a/etc/wmakeFiles/libccmio/options b/etc/wmakeFiles/libccmio/options
new file mode 100644
index 0000000..5f4fb60
--- /dev/null
+++ b/etc/wmakeFiles/libccmio/options
@@ -0,0 +1,3 @@
+/* NOTE: make any changes to this file in etc/wmakeFiles/ */
+
+/* EXE_INC = */
diff --git a/makeCCMIO b/makeCCMIO
new file mode 100755
index 0000000..12b1137
--- /dev/null
+++ b/makeCCMIO
@@ -0,0 +1,143 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     makeCCMIO
+#
+# Description
+#     Build CD-adapco's ccmio library
+#
+#------------------------------------------------------------------------------
+
+# Get version info
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/libccmio)
+
+ccmio_version=${ccmio_version:-libccmio-2.6.1}
+targetType=libso
+
+#------------------------------------------------------------------------------
+# run from third-party directory only
+cd ${0%/*} || exit 1
+wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
+    echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
+    echo "    The environment variables are inconsistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+}
+[ -n "$FOAM_EXT_LIBBIN" ] || {
+    echo "Error: FOAM_EXT_LIBBIN not set"
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+}
+. etc/tools/ThirdPartyFunctions
+#------------------------------------------------------------------------------
+
+usage()
+{
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    /bin/cat<<USAGE
+
+Usage: ${0##*/} [OPTION] [lib|libso] [libccmio-VERSION]
+options:
+  -help
+
+* Compile the proprietary libccmio library
+      $ccmio_version
+
+  Users wishing to make use of the library should contact cd-adapco
+  (Siemens PLM) for possible download and terms of use.
+
+  After obtaining the $ccmio_version library, place in folder
+
+      $WM_THIRD_PARTY_DIR/$ccmio_version/
+
+  prior to running this script.
+
+USAGE
+    exit 1
+}
+
+
+# Parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    lib|libso)
+        targetType="$1"
+        shift
+        ;;
+    libccmio-[1-9]*)
+        ccmio_version="${1%%/}"
+        shift
+        ;;
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
+    esac
+done
+
+# warn if unavailable
+if [ ! -d ${ccmio_version} ]
+then
+    usage "missing source directory '$ccmio_version'"
+fi
+
+
+#------------------------------------------------------------------------------
+CCMIO_ARCH_PATH=$installBASE/$ccmio_version
+
+#
+# Build LIBCCMIO
+#
+echo "---------------"
+(
+    cd $ccmio_version || exit 1
+    incDIR=$CCMIO_ARCH_PATH/include/libccmio
+    libDIR=$CCMIO_ARCH_PATH/lib
+
+    mkdir -p $incDIR 2>/dev/null
+    mkdir -p $libDIR 2>/dev/null
+
+    cpMakeFiles libccmio 2>/dev/null
+    set +x
+    if wmake $targetType
+    then
+        # make headers available:
+        /bin/cp -pv libccmio/ccmio*.h $incDIR
+
+        # relocate static libraries to sub-directory:
+        if [ "$targetType" = lib ]
+        then
+            /bin/mv -v $FOAM_EXT_LIBBIN/libccmio.a $libDIR
+        fi
+    fi
+)
+
+
+#------------------------------------------------------------------------------