diff --git a/singularity/install.sh b/singularity/install.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e6621b1e13c79fd4653a897a53b307ae46d89f20
--- /dev/null
+++ b/singularity/install.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+set -x
+
+################################################################################
+# GENERIC: Base directory for source, install, build.
+SOURCE_BASE_DIR=/data/software/sources
+BUILD_BASE_DIR=/data/software/sources
+INSTALL_BASE_DIR=/data/software/install
+MODULE_BASE_DIR=/data/software/modules
+################################################################################
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+LIB_NAME="singularity"
+LIB_VERSION=2.4.0
+GCC_VERSION=6.4.0
+
+SINGULARITY_REPOSITORY=https://github.com/singularityware/singularity.git
+
+# Use cern repository! (patched version)
+LIB_VERSION_MAJOR=`echo "${LIB_VERSION}" | sed 's/\([0-9]\)[.][0-9][.][0-9]/\1/g'`
+LIB_VERSION_MINOR=`echo "${LIB_VERSION}" | sed 's/[0-9][.]\([0-9]\)[.][0-9]/\1/g'`
+LIB_VERSION_PATCH=`echo "${LIB_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g'`
+GCC_VERSION_MAJOR=`echo "${GCC_VERSION}" | sed 's/\([0-9]\)[.][0-9][.][0-9]/\1/g'`
+GCC_VERSION_MINOR=`echo "${GCC_VERSION}" | sed 's/[0-9][.]\([0-9]\)[.][0-9]/\1/g'`
+GCC_VERSION_PATCH=`echo "${GCC_VERSION}" | sed 's/[0-9][.][0-9][.]\([0-9]\)/\1/g'`
+
+
+DEPEND_GCC=gcc-${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
+DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
+
+SOURCE_DIR=${SOURCE_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+BUILD_DIR=${BUILD_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
+INSTALL_DIR=${INSTALL_BASE_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
+MODULE_DIR=${MODULE_BASE_DIR}/tools/${LIB_NAME}
+MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
+
+
+prepare_lib()
+{
+    # Prepare directories.
+    mkdir -p ${SOURCE_DIR}
+    cd ${SOURCE_DIR}
+    if [[ ! -d ${SOURCE_DIR}/singularity ]]; then
+        echo "-- Cloning repositories in ${SOURCE_DIR}/"
+        #--------------------------------------------------
+        # Get LLVM
+        git clone ${SINGULARITY_REPOSITORY}
+    else
+        echo "[WARNING] Repo exist ignore clone! (${SOURCE_DIR}/llvm)"
+        exit 1
+    fi
+    cd singularity
+}
+
+build_lib() {
+    echo "-- Building ${LIB_NAME}-${LIB_VERSION}"
+
+    if [[ ! -d ${BUILD_DIR} ]]; then
+        mkdir -p ${BUILD_DIR}
+    else
+        echo "[WARNING] Build directory exist! Remove it first ! ${BUILD_DIR}"
+        exit 1
+    fi
+    module purge
+    module load gcc/${GCC_VERSION}
+    module list
+
+    # Check gcc version here
+    gcc --version |head -n 1
+    sleep 2
+
+    ./autogen.sh
+    ./configure --prefix=${INSTALL_DIR}
+    make
+}
+
+install_lib()
+{
+    sudo make install
+}
+
+install_module()
+{
+    cd $SCRIPT_DIR
+    mkdir -p ${MODULE_DIR}
+
+    export LIB_NAME
+    export LIB_VERSION
+    export INSTALL_DIR
+    envtpl  --keep-template -o $MODULE_PATH module.tmpl
+}
+
+if [[ $1 == "module" ]]
+then
+    install_module
+else
+    prepare_lib
+    build_lib
+    install_lib
+    install_module
+fi
diff --git a/singularity/module.tmpl b/singularity/module.tmpl
new file mode 100644
index 0000000000000000000000000000000000000000..cf1242d1c10ada99b4d5ecebdde9adbe6867ec6b
--- /dev/null
+++ b/singularity/module.tmpl
@@ -0,0 +1,24 @@
+#%Module1.0#####################################################################
+###
+### {{ LIB_NAME }} {{ LIB_VERSION }} module
+###
+proc ModulesHelp { } {
+    global version prefix
+
+    puts stderr "\ttools/{{ LIB_NAME }}/{{ LIB_VERSION }} - loads {{ LIB_NAME }} {{ LIB_VERSION }} and its environment"
+}
+
+module-whatis   "Loads {{ LIB_NAME }} {{ LIB_VERSION }} and its environment"
+
+# for Tcl script use only
+set version     {{ LIB_VERSION }}
+set prefix      {{ INSTALL_DIR }}
+
+prepend-path CMAKE_PREFIX_PATH $prefix
+prepend-path PATH $prefix/bin
+prepend-path LD_LIBRARY_PATH $prefix/lib
+prepend-path MANPATH $prefix/share/man
+
+unsetenv LANGUAGE
+unsetenv LANG
+unsetenv LC