diff --git a/etc/bashrc b/etc/bashrc
index dd9b7807e2f0831df6a970ee5d18f77e320ad84b..0cdf4031ba80722aabce9603d5562d83d1406b55 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -173,6 +173,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
+##_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ADIOS`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW`
diff --git a/etc/config.csh/ADIOS b/etc/config.csh/ADIOS
new file mode 100644
index 0000000000000000000000000000000000000000..c53511fd8e703226e47a6233dfa0a5077ef75f73
--- /dev/null
+++ b/etc/config.csh/ADIOS
@@ -0,0 +1,71 @@
+#----------------------------------*-sh-*--------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
+# \\/ 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/>.
+#
+# File
+# etc/config.csh/ADIOS
+#
+# Description
+# Setup file for ADIOS include/libraries.
+# Sourced from OpenFOAM-<VERSION>/etc/cshrc
+#
+# If using system-wide installations, use the following settings:
+#
+# adios_version=adios-system
+#
+# If the system adios is unusable (eg, too old) and you don't
+# have or want a ThirdParty installation:
+#
+# adios_version=adios-none
+#
+# If using a central installation, but not located under ThirdParty:
+# - specify adios-system
+# - provide full paths for ADIOS_ARCH_PATH
+#
+# Note
+# When building OpenFOAM, any changes made here MUST be made in the
+# equivalent config.sh version too, since that is the one which will
+# be used during the build process. See further notes there.
+#
+#------------------------------------------------------------------------------
+
+set adios_version=ADIOS-1.11.0
+setenv ADIOS_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
+
+#------------------------------------------------------------------------------
+if ($?FOAM_VERBOSE && $?prompt) then
+ echo "Using adios ($adios_version) -> $ADIOS_ARCH_PATH"
+endif
+
+# If ADIOS_ARCH_PATH does not end with '-system' or '-none',
+# it is located within ThirdParty, or a central installation
+# outside of ThirdParty and should be added to the path.
+
+set ending="${ADIOS_ARCH_PATH:t}"
+if ( "$ending" != "adios-none" && "$ending" != "adios-system" ) then
+ # PATH was already cleaned by etc/cshrc caller
+ _foamAddPath $ADIOS_ARCH_PATH/bin
+endif
+
+unset adios_version ending cleaned
+
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS
new file mode 100644
index 0000000000000000000000000000000000000000..898a2bc28da982259591cff0cc8d1724133f7c94
--- /dev/null
+++ b/etc/config.sh/ADIOS
@@ -0,0 +1,76 @@
+#----------------------------------*-sh-*--------------------------------------
+# ========= |
+# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+# \\ / O peration |
+# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
+# \\/ 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/>.
+#
+# File
+# etc/config.sh/ADIOS
+#
+# Description
+# Setup file for ADIOS include/libraries.
+# Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+# If using system-wide installations, use the following settings:
+#
+# adios_version=adios-system
+#
+# If the system adios is unusable (eg, too old) and you don't
+# have or want a ThirdParty installation:
+#
+# adios_version=adios-none
+#
+# If using a central installation, but not located under ThirdParty:
+# - specify adios-system
+# - provide full paths for ADIOS_ARCH_PATH
+#
+# Note
+# Since ADIOS is a static library build, the libraries are renamed
+# for the appropriate MPI. Eg, libadios_openmpi-system
+#
+#------------------------------------------------------------------------------
+
+adios_version=ADIOS-1.11.0
+export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
+
+#------------------------------------------------------------------------------
+if [ "$FOAM_VERBOSE" -a "$PS1" ]
+then
+ echo "Using adios ($adios_version) -> $ADIOS_ARCH_PATH" 1>&2
+fi
+
+if type _foamAddPath > /dev/null 2>&1 # normal sourcing
+then
+ # If ADIOS_ARCH_PATH does not end with '-system' or '-none',
+ # it is located within ThirdParty, or a central installation
+ # outside of ThirdParty and should be added to the path.
+
+ ending="${ADIOS_ARCH_PATH##*-}"
+ if [ "$ending" != none -a "$ending" != system ]
+ then
+ # PATH was already cleaned by etc/bashrc caller
+ _foamAddPath $ADIOS_ARCH_PATH/bin
+ fi
+
+ unset adios_version ending cleaned
+
+fi
+
+#------------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index 55f2b0174abadad779fe6903a7376351d7045c87..54c74ad3f96899fd46d511391405c2d23eb66045 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -217,6 +217,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
+##_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ADIOS`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/FFTW`