diff --git a/Compiler/atlas/3/variants b/Compiler/atlas/3/variants
index 751bf86..eda70bd 100644
--- a/Compiler/atlas/3/variants
+++ b/Compiler/atlas/3/variants
@@ -2,4 +2,7 @@ atlas/3.10.3	unstable	gcc/4.8.5
 atlas/3.10.2	deprecated	gcc/4.9.2
 atlas/3.10.3	unstable	gcc/4.9.4
 atlas/3.10.3	unstable	gcc/5.4.0
+atlas/3.10.3	unstable	gcc/5.5.0
 atlas/3.10.3	unstable	gcc/6.2.0
+atlas/3.10.3	unstable	gcc/6.4.0
+atlas/3.10.3	unstable	gcc/7.3.0
diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/1/variants
index e7a7d4d..8a77ffc 100644
--- a/Compiler/gtest/1/variants
+++ b/Compiler/gtest/1/variants
@@ -1,2 +1,3 @@
 gtest/1.7.0	stable		b:cmake b:gcc/5.4.0
 gtest/1.7.0	stable		b:cmake b:gcc/7.3.0
+gtest/1.7.0	stable		b:cmake b:clang-macos/9.0.0
diff --git a/HDF5/H5hut/2/variants b/HDF5/H5hut/2/variants
index 7cd6c8d..77d51e5 100644
--- a/HDF5/H5hut/2/variants
+++ b/HDF5/H5hut/2/variants
@@ -24,3 +24,4 @@ H5hut/2.0.0rc4	unstable	clang-macos/9.0.0 openmpi/3.0.0  hdf5/1.10.1 b:automake/
 H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/1.10.7 hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
 H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/2.1.2  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
 H5hut/2.0.0rc4	unstable	intel/17.4 openmpi/3.0.0  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
+H5hut/2.0.0rc4	unstable	clang-macos/9.0.0 openmpi/3.0.0  hdf5/1.10.1 b:automake/1.15 b:autoconf/2.69 b:libtool/2.4.6 b:Python/2.7.12 b:parmetis/4.0.3
diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build
index ddb0b15..51bad84 100755
--- a/HDF5/H5hut/build
+++ b/HDF5/H5hut/build
@@ -14,12 +14,19 @@ pbuild::configure() {
 	if (( V_MAJOR >= 2 )); then
 		: config_args+=" --enable-python"
 	fi
+	case "${COMPILER}" in
+		"clang-macos" )
+			:
+			;;
+		* )
+			config_args+='--enable-fortran'
+			;;
+	esac
 
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-parallel \
 		--enable-debug \
-		--enable-fortran \
 		--enable-shared \
 		--with-hdf5=$HDF5_PREFIX \
 		--with-pic \
diff --git a/Libraries/mpc/1/variants b/Libraries/mpc/1/variants
index 97455ac..a0caba7 100644
--- a/Libraries/mpc/1/variants
+++ b/Libraries/mpc/1/variants
@@ -3,3 +3,4 @@ mpc/1.0.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4
 mpc/1.0.3-1	stable		b:gmp/6.1.1 b:mpfr/3.1.4
 mpc/1.0.3-2	stable		b:gmp/6.1.2 b:mpfr/3.1.5
 mpc/1.1.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0
+mpc/1.1.0-1	stable		b:gmp/6.1.2 b:mpfr/4.0.1
diff --git a/Libraries/mpfr/4/variants b/Libraries/mpfr/4/variants
index cec1cb1..3d8e833 100644
--- a/Libraries/mpfr/4/variants
+++ b/Libraries/mpfr/4/variants
@@ -1 +1,2 @@
 mpfr/4.0.0      stable          b:gmp/6.1.2
+mpfr/4.0.1      stable          b:gmp/6.1.2
diff --git a/MPI/OPAL/1.6/variants b/MPI/OPAL/1.6/variants
index 3e73d86..ab5c8cb 100644
--- a/MPI/OPAL/1.6/variants
+++ b/MPI/OPAL/1.6/variants
@@ -5,4 +5,5 @@ OPAL/1.6.0rc4	unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2
 OPAL/1.6.0rc5	unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
 OPAL/1.6.0rc6	unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
 OPAL/1.6.0	stable	 gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
-OPAL/1.6.1	unstable gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+OPAL/1.6.1	stable   gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+OPAL/1.6.2	stable   gcc/5.4.0 openmpi/1.10.4 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 dks/1.1.2 b:cmake/3.6.3 b:OpenBLAS/0.2.19
diff --git a/MPI/OPAL/build b/MPI/OPAL/build
index 3ba06d5..4072d08 100755
--- a/MPI/OPAL/build
+++ b/MPI/OPAL/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL='http://amas.web.psi.ch/Downloads/OPAL/OPAL-1.6.0rc6.tar.bz2'
+SOURCE_URL='http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2'
 
 config_args=()
 
diff --git a/MPI/trilinos/12/variants.Darwin b/MPI/trilinos/12/variants.Darwin
index f8e3d1d..c63d7b8 100644
--- a/MPI/trilinos/12/variants.Darwin
+++ b/MPI/trilinos/12/variants.Darwin
@@ -12,3 +12,4 @@ trilinos/12.10.1	unstable	gcc/6.2.0 openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.
 trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
 trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
 trilinos/12.12.1	unstable	gcc/7.3.0 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+trilinos/12.12.1	unstable	clang-macos/9.0.0 openmpi/3.0.0 hdf5/1.10.1 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
diff --git a/Programming/Python/2/variants b/Programming/Python/2/variants
index 0f8a7d8..5d8619a 100644
--- a/Programming/Python/2/variants
+++ b/Programming/Python/2/variants
@@ -1,2 +1,3 @@
 Python/2.7.11	stable	openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4
 Python/2.7.12	stable	openssl/1.0.2j Tcl/8.6.4 Tk/8.6.4
+Python/2.7.14	stable	openssl/1.0.2o Tcl/8.6.4 Tk/8.6.4
diff --git a/Programming/Python/build b/Programming/Python/build
index 6b24c55..6549949 100755
--- a/Programming/Python/build
+++ b/Programming/Python/build
@@ -31,7 +31,7 @@ pbuild::post_install() {
 	pip${V_MAJOR} install pandas
 	pip${V_MAJOR} install sympy
 	pip${V_MAJOR} install nose
-	pip${V_MAJOR} install mpi4py
+	#pip${V_MAJOR} install mpi4py
 }
 
 pbuild::add_to_group 'Programming'
diff --git a/Programming/automake/1/variants b/Programming/automake/1/variants
index 5704e8c..25829fa 100644
--- a/Programming/automake/1/variants
+++ b/Programming/automake/1/variants
@@ -1,2 +1,3 @@
 automake/1.14	stable	m4/1.4.17 autoconf/2.69
 automake/1.15	stable	m4/1.4.17 autoconf/2.69
+automake/1.16	stable	m4/1.4.17 autoconf/2.69
diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants
index 08b36c2..a2e118e 100644
--- a/Programming/gcc/5/variants
+++ b/Programming/gcc/5/variants
@@ -2,4 +2,5 @@ gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
 gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
+gcc/5.5.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0-1
 
diff --git a/Programming/perl/5/variants b/Programming/perl/5/variants
new file mode 100644
index 0000000..b36d254
--- /dev/null
+++ b/Programming/perl/5/variants
@@ -0,0 +1 @@
+perl/5.26.1	unstable
diff --git a/Programming/perl/build b/Programming/perl/build
new file mode 100755
index 0000000..3cdf58e
--- /dev/null
+++ b/Programming/perl/build
@@ -0,0 +1,17 @@
+#!/usr/bin/env modbuild
+
+SOURCE_URL="http://www.cpan.org/src/5.0/$P-$V.tar.gz"
+
+pbuild::configure() {
+	"${MODULE_SRCDIR}"/configure.gnu \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+pbuild::post_build() {
+	make test
+}
+
+pbuild::compile_in_sourcetree
+pbuild::add_to_group 'Programming'
+pbuild::make_all
diff --git a/Programming/perl/modulefile b/Programming/perl/modulefile
new file mode 100644
index 0000000..21ac986
--- /dev/null
+++ b/Programming/perl/modulefile
@@ -0,0 +1,19 @@
+#%Module1.0
+
+module-whatis		"scripting language."
+module-url		"http://www.perl.org/"
+module-license		"See https://dev.perl.org/licenses/"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+Perl 5 is a highly capable, feature-rich programming language with
+over 29 years of development. Perl 5 runs on over 100 platforms from
+portables to mainframes and is suitable for both rapid prototyping
+and large scale development projects.
+
+'Perl' is a family of languages, 'Perl 6' is part of the family, but
+it is a separate language which has its own development team. Its
+existence has no significant impact on the continuing development of
+'Perl 5'. 
+"
+
diff --git a/Tools/asciidoc/8/variants b/Tools/asciidoc/8/variants
new file mode 100644
index 0000000..f3f1245
--- /dev/null
+++ b/Tools/asciidoc/8/variants
@@ -0,0 +1 @@
+asciidoc/8.6.9	unstable	Python/2.7.14
diff --git a/Tools/asciidoc/build b/Tools/asciidoc/build
new file mode 100755
index 0000000..f674122
--- /dev/null
+++ b/Tools/asciidoc/build
@@ -0,0 +1,31 @@
+#!/usr/bin/env modbuild
+
+SOURCE_URL="https://sourceforge.net/projects/asciidoc/files/$P/$V/$P-$V.tar.gz"
+
+pbuild::configure() {
+	"${MODULE_SRCDIR}"/configure \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+pbuild::compile_in_sourcetree
+pbuild::add_to_group 'Tools'
+pbuild::set_docfiles 	\
+	BUGS		\
+	BUGS.txt	\
+	CHANGELOG	\
+	CHANGELOG.txt	\
+	COPYING		\
+	COPYRIGHT	\
+	INSTALL		\
+	INSTALL.txt	\
+	MANIFEST	\
+	README		\
+	README.txt
+pbuild::make_all
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/asciidoc/modulefile b/Tools/asciidoc/modulefile
new file mode 100644
index 0000000..fd4336c
--- /dev/null
+++ b/Tools/asciidoc/modulefile
@@ -0,0 +1,18 @@
+#%Module1.0
+
+module-whatis		"translater for asciidoc formatted documents"
+module-url		"http://www.methods.co.nz/asciidoc/index.html"
+module-license		"GPL v2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+AsciiDoc is a text document format for writing notes, documentation,
+articles, books, ebooks, slideshows, web pages, man pages and blogs.
+AsciiDoc files can be translated to many formats including HTML, PDF,
+EPUB, man page.
+
+AsciiDoc is highly configurable: both the AsciiDoc source file syntax
+and the backend output markups (which can be almost any type of SGML/XML
+markup) can be customized and extended by the user.
+"
+
diff --git a/Tools/git/2/variants b/Tools/git/2/variants
index 1f597be..59357c2 100644
--- a/Tools/git/2/variants
+++ b/Tools/git/2/variants
@@ -2,5 +2,5 @@ git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.5.2	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.11.1	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.13.0	stable		Tcl/8.6.4 Tk/8.6.4
-git/2.16.2	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.13.0	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
+git/2.16.2	stable		Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
diff --git a/Tools/git/build b/Tools/git/build
index 16dcee2..e48a85e 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -15,6 +15,7 @@ pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-tcltk \
+		--with-perl="${PERL_PREFIX}/bin/perl" \
 		|| exit 1
 }
 
diff --git a/Tools/openssl/1/variants b/Tools/openssl/1/variants
index cde34c7..68a9ea4 100644
--- a/Tools/openssl/1/variants
+++ b/Tools/openssl/1/variants
@@ -1,2 +1,3 @@
 openssl/1.0.2h       deprecated
 openssl/1.0.2j       stable
+openssl/1.0.2o       stable
diff --git a/Tools/vim/8/variants b/Tools/vim/8/variants
index f0bb62d..3a113be 100644
--- a/Tools/vim/8/variants
+++ b/Tools/vim/8/variants
@@ -1 +1 @@
-vim/8.0.586	unstable
+vim/8.0.586	unstable	b:Python/2.7.14
diff --git a/Tools/xmlto/0/variants b/Tools/xmlto/0/variants
new file mode 100644
index 0000000..d1fbc24
--- /dev/null
+++ b/Tools/xmlto/0/variants
@@ -0,0 +1 @@
+xmlto/0.0.28	stable
diff --git a/Tools/xmlto/build b/Tools/xmlto/build
new file mode 100755
index 0000000..e2874b9
--- /dev/null
+++ b/Tools/xmlto/build
@@ -0,0 +1,26 @@
+#!/usr/bin/env modbuild
+
+SOURCE_URL="https://releases.pagure.org/$P/$P-$V.tar.bz2"
+
+pbuild::configure() {
+	"${MODULE_SRCDIR}"/configure \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+pbuild::compile_in_sourcetree
+pbuild::add_to_group 'Tools'
+pbuild::set_docfiles	\
+	AUTHORS		\
+	COPYING		\
+	FAQ		\
+	NEWS		\
+	README		\
+	THANKS 
+pbuild::make_all
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/Tools/xmlto/modulefile b/Tools/xmlto/modulefile
new file mode 100644
index 0000000..9cf5023
--- /dev/null
+++ b/Tools/xmlto/modulefile
@@ -0,0 +1,18 @@
+#%Module1.0
+
+module-whatis		"script to convert XML to other formats"
+module-url		"https://pagure.io/xmlto"
+module-license		"GPL v2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+Utility xmlto is a simple shell script for converting XML files to various
+formats. It serves as easy to use command line frontend to make fine output
+without remembering many long options and searching for the syntax of the
+backends.
+
+At the moment it supports conersion from docbook, xhtml1 and fo format to
+various output formats(awt, fo, htmlhelp, javahelp, mif, pdf, svg, xhtml,
+dvi, html, html-nochunks, man , pcl, ps, txt, xhtml-nochunks) 
+"
+