diff --git a/buildenv b/buildenv
index 5861a7a..b3888ac 100644
--- a/buildenv
+++ b/buildenv
@@ -2,13 +2,14 @@
 # Set up environment variables for general build tool to operate
 #
 export ZOPEN_TYPE="TARBALL"
+MAKE_VERSION="4.4.1"
 
-export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz"
+export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/make/make-$MAKE_VERSION.tar.gz"
 export ZOPEN_TARBALL_DEPS="curl gzip tar m4 perl make zoslib" 
 
 export ZOPEN_GIT_URL="https://git.savannah.gnu.org/git/make.git"
 export ZOPEN_GIT_DEPS="git make m4 perl autoconf automake help2man texinfo xz"
-export ZOPEN_CHECK="${ZOPEN_ROOT}/makecheck.sh"
+export ZOPEN_CHECK="check_make"
 export ZOPEN_INSTALL="install_make"
 export ZOPEN_COMP=CLANG
 
@@ -18,6 +19,11 @@ install_make()
   ./make install "$@"
 }
 
+check_make()
+{
+(cd "${ZOPEN_ROOT}/make-$MAKE_VERSION/tests" && perl ./run_make_tests.pl -srcdir ../ -make ../make 2>&1)
+}
+
 zopen_check_results()
 {
 chk="$1/$2_check.log"
diff --git a/makecheck.sh b/makecheck.sh
deleted file mode 100755
index efa74c2..0000000
--- a/makecheck.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-(cd "${ZOPEN_ROOT}/make-4.4.0.90/tests" && perl ./run_make_tests.pl -srcdir ../ -make ../make 2>&1)