diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants
index c0ecaab..59120c3 100644
--- a/Compiler/boost/1/variants
+++ b/Compiler/boost/1/variants
@@ -16,3 +16,4 @@ boost/1.62.0         stable	gcc/4.9.4 Python/2.7.12
 boost/1.62.0         stable	gcc/5.4.0 Python/2.7.12 
 boost/1.62.0         stable	gcc/6.2.0 Python/2.7.12 
 boost/1.62.0         unstable	gcc/6.3.0 Python/2.7.12 
+boost/1.63.0         stable     gcc/6.3.0 Python/2.7.12
diff --git a/Compiler/openmpi/2.0/variants.Linux b/Compiler/openmpi/2.0/variants.Linux
index 507b806..1992f09 100644
--- a/Compiler/openmpi/2.0/variants.Linux
+++ b/Compiler/openmpi/2.0/variants.Linux
@@ -4,5 +4,6 @@ openmpi/2.0.1   stable		gcc/4.8.5
 openmpi/2.0.1   stable		gcc/4.9.4
 openmpi/2.0.1   stable		gcc/5.4.0
 openmpi/2.0.1   stable		gcc/6.2.0
+openmpi/2.0.1	stable		gcc/6.3.0
 
 openmpi/2.0.0	stable		intel/16.3
diff --git a/Libraries/gmp/6/variants b/Libraries/gmp/6/variants
index c23f150..0f82ba5 100644
--- a/Libraries/gmp/6/variants
+++ b/Libraries/gmp/6/variants
@@ -1,3 +1,4 @@
 gmp/6.0.0	stable	
 gmp/6.1.0	stable	
 gmp/6.1.1	stable	
+gmp/6.1.2	stable
diff --git a/Libraries/mpfr/3/variants b/Libraries/mpfr/3/variants
index 58f0e6e..35b0212 100644
--- a/Libraries/mpfr/3/variants
+++ b/Libraries/mpfr/3/variants
@@ -2,3 +2,4 @@ mpfr/3.1.2	stable		b:gmp/5.1.1
 mpfr/3.1.3	stable		b:gmp/6.0.0
 mpfr/3.1.4	stable		b:gmp/6.1.0
 mpfr/3.1.4-1	stable		b:gmp/6.1.1
+mpfr/3.1.5	stable		b:gmp/6.1.2
diff --git a/MPI/OPAL/1.5/variants b/MPI/OPAL/1.5/variants
index c5b189d..e571112 100644
--- a/MPI/OPAL/1.5/variants
+++ b/MPI/OPAL/1.5/variants
@@ -1,4 +1,4 @@
 OPAL/1.5.0-20161209	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
 OPAL/1.5.0-20170126	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
-OPAL/1.5.1-20170210	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
+OPAL/1.5.1-20170216	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 boost/1.62.0 hdf5/1.8.18 H5hut/2.0.0rc3 gsl/2.2.1 trilinos/12.10.1 cuda/8.0.44 b:cmake/3.6.3 b:OpenBLAS/0.2.19
 
diff --git a/Programming/gcc/6/variants b/Programming/gcc/6/variants
index 7032046..dee69bc 100644
--- a/Programming/gcc/6/variants
+++ b/Programming/gcc/6/variants
@@ -1,2 +1,3 @@
 gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
 gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
+gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
diff --git a/Programming/gtest/1/variants b/Programming/gtest/1/variants
new file mode 100644
index 0000000..9c6ffe2
--- /dev/null
+++ b/Programming/gtest/1/variants
@@ -0,0 +1 @@
+gtest/1.7.0	unstable	b:cmake
diff --git a/Programming/gtest/build b/Programming/gtest/build
index c128e37..c8e8d27 100755
--- a/Programming/gtest/build
+++ b/Programming/gtest/build
@@ -1,7 +1,36 @@
 #!/usr/bin/env modbuild
 
+declare -a config_args=()
+
+pbuild::set_docfiles \
+	CHANGES \
+	CONTRIBUTORS \
+	LICENSE \
+	README
+
+pbuild::configure() {
+        cmake \
+                -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+                -DCMAKE_BUILD_TYPE=RELEASE \
+                "${config_args[@]}" \
+                "${MODULE_SRCDIR}"
+}
+
+pbuild::install() {
+	local -r _include_srcdir="${MODULE_SRCDIR}/include/gtest"
+	local -r _include_dstdir="${PREFIX}/include"
+	if [[ -e "${_include_dstdir}" ]]; then
+		chmod -R u+w "${_include_dstdir}"
+	fi
+	mkdir -p "${_include_dstdir}"
+	cp -rv "${_include_srcdir}"/* "${_include_dstdir}"
+	
+
+	local -r _lib_dstdir="${PREFIX}/lib"
+	mkdir -p "${_lib_dstdir}"
+	cp -v *.a "${_lib_dstdir}"
+}
+
 pbuild::add_to_group 'Programming'
-pbuild::set_runtime_dependencies ""
-pbuild::set_build_dependencies   "${COMPILER}"
 pbuild::make_all
 
diff --git a/Programming/gtest/modulefile b/Programming/gtest/modulefile
new file mode 100644
index 0000000..330ede2
--- /dev/null
+++ b/Programming/gtest/modulefile
@@ -0,0 +1,10 @@
+#%Module1.0
+
+module-whatis		"Google's C++ test framework"
+module-url		"https://github.com/google/googletest/"
+module-license	 	"See ${PREFIX}/share/doc/gtest/LICENSE"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help	"
+See https://github.com/google/googletest/blob/master/googletest/docs/Primer.md
+"