diff --git a/scripts/Compiler/openmpi/build b/scripts/Compiler/openmpi/build
index 473503e..e865b9f 100755
--- a/scripts/Compiler/openmpi/build
+++ b/scripts/Compiler/openmpi/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-mpi-cxx \
@@ -14,9 +12,8 @@ pmodules.configure() {
 		|| exit 1
 }
 
-
-pmodules.add_to_group 'Compiler'
-pmodules.set_runtime_dependencies "${COMPILER}"
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
-pmodules.make_all
+pbuild::add_to_group 'Compiler'
+pbuild::set_runtime_dependencies "${COMPILER}"
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::set_docfiles 'AUTHORS' 'LICENSE' 'NEWS' 'README'
+pbuild::make_all
diff --git a/scripts/Libraries/giflib/build b/scripts/Libraries/giflib/build
index 616cc8b..29e2c92 100755
--- a/scripts/Libraries/giflib/build
+++ b/scripts/Libraries/giflib/build
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
 
-pmodules.add_to_group 'Libraries'
-pmodules.set_build_dependencies "${COMPILER}"
-pmodules.make_all
+pbuild::add_to_group 'Libraries'
+pbuild::set_build_dependencies "${COMPILER}"
+pbuild::make_all
diff --git a/scripts/MPI/hdf5/build b/scripts/MPI/hdf5/build
index b8d233e..061d7fb 100755
--- a/scripts/MPI/hdf5/build
+++ b/scripts/MPI/hdf5/build
@@ -1,8 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-source "$(dirname $0)/../../../lib/libpmodules.bash"
-
-pmodules.configure() {
+pbuild::configure() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -22,13 +20,13 @@ pmodules.configure() {
 }
 
 
-pmodules.add_to_group 'MPI'
-pmodules.set_runtime_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_build_dependencies "${COMPILER}" "${MPI}"
-pmodules.set_docfiles \
+pbuild::add_to_group 'MPI'
+pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_build_dependencies "${COMPILER}" "${MPI}"
+pbuild::set_docfiles \
 		ACKNOWLEDGMENTS \
 		COPYING \
 		MANIFEST \
 		README.txt
-pmodules.make_all
+pbuild::make_all
 
diff --git a/scripts/Tools/git/build b/scripts/Tools/git/build
index 26046ed..ef2b0a9 100755
--- a/scripts/Tools/git/build
+++ b/scripts/Tools/git/build
@@ -1,6 +1,10 @@
-#!/usr/bin/env pbuild
+#!/usr/bin/env modbuild
 
-export NO_APPLE_COMMON_CRYPTO=1
+case ${OS} in
+Darwin )
+	export NO_APPLE_COMMON_CRYPTO=1
+	;;
+esac
 
 pbuild::configure() {
 	cd "${MODULE_SRCDIR}"