diff --git a/Tools/openssl/build b/Tools/openssl/build
index 2a0a769..3d64adb 100755
--- a/Tools/openssl/build
+++ b/Tools/openssl/build
@@ -1,25 +1,24 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://www.openssl.org/source/$P-$V.tar.gz"
-
-pbuild::configure() {
-	case ${OS} in
-	Darwin )
-		target='darwin64-x86_64-cc'
-		;;
-	Linux )
-		target='linux-x86_64'
-		;;
-	esac
-	export CFLAGS=-fPIC
-	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" ${target} \
-		|| exit 1
-}
+pbuild::set_download_url "https://www.openssl.org/source/$P-$V.tar.gz"
 
 # use system gcc to compile
 declare -rx CC=gcc
 
 pbuild::add_to_group 'Tools'
 pbuild::compile_in_sourcetree
-pbuild::make_all
+
+pbuild::pre_configure_Darwin() {
+	pbuild::add_configure_args 'darwin64-x86_64-cc'
+}
+
+pbuild::pre_configure_Linux() {
+	pbuild::add_configure_args 'linux-x86_64'
+}
+
+pbuild::configure() {
+	export CFLAGS='-fPIC'
+	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" "${CONFIGURE_ARGS[@]}" \
+		|| exit 1
+}