diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index 517c2438..5e4abc64 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -13,7 +13,7 @@ echo "Using BTC directory: ${btc_dir}"
 
 cd "${root_dir}"
 
-copy_header_files () {
+copy_files () {
   if [[ -d "${artifacts_dir}" && -d "${h_and_a_dir}" && -d "${btc_dir}" ]]; then
     mkdir -p "${artifacts_dir}/include" > /dev/null 2>&1
     pushd "${root_dir}"
@@ -163,14 +163,12 @@ apply the current patch from "${root_dir}"/etc/bitcoin.patch? (y/N): "
   echo 'make V=1'
   make V=1
 
-  echo 'Copying libbitcoind.{so|dylib} to its appropriate location.'
+  echo 'Copying files to their appropriate location.'
   if test -e "${btc_dir}/src/.libs/libbitcoind.a"; then
     mkdir -p "${artifacts_dir}"
-    cp -R "${btc_dir}"/src/.libs/libbitcoind.a "${artifacts_dir}"
     echo "Creating the sha marker for the patching in libbitcoind..."
     echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${artifacts_dir}"/patch_sha.txt
-    echo "Copying the header files in order to be cached..."
-    copy_header_files
+    copy_files
   else
     echo "Could not find the libraries after they should have been built, please run make clean inside the libbitcoind dir and run npm install again."
     exit 1
diff --git a/etc/bitcoin.patch b/etc/bitcoin.patch
index be835ca3..dfce817d 100644
--- a/etc/bitcoin.patch
+++ b/etc/bitcoin.patch
@@ -139,14 +139,14 @@ index e7aa48d..df0f7ae 100644
  endef
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 1c2f770..d2eca15 100644
+index 1c2f770..4c87b26 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,6 +1,12 @@
  DIST_SUBDIRS = secp256k1
  AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
 
-+lib_LTLIBRARIES =
++noinst_LTLIBRARIES =
 +libbitcoind_la_LIBADD =
 +libbitcoind_la_LDFLAGS = -no-undefined
 +STATIC_BOOST_LIBS =
@@ -179,7 +179,7 @@ index 1c2f770..d2eca15 100644
  TESTS =
 
 +if BUILD_BITCOIN_LIBS
-+lib_LTLIBRARIES += libbitcoinconsensus.la
++noinst_LTLIBRARIES += libbitcoinconsensus.la
 +LIBBITCOIN_CONSENSUS += libbitcoinconsensus.la
 +endif
 +
@@ -192,7 +192,7 @@ index 1c2f770..d2eca15 100644
    bin_PROGRAMS += bitcoin-cli bitcoin-tx
  endif
 +else
-+lib_LTLIBRARIES += libbitcoind.la
++noinst_LTLIBRARIES += libbitcoind.la
 +endif
 
  .PHONY: FORCE
diff --git a/platform/os.sh b/platform/os.sh
index 9e69cf07..986de31b 100755
--- a/platform/os.sh
+++ b/platform/os.sh
@@ -145,7 +145,7 @@ if test -z "$1" -o x"$1" = x'host'; then
 fi
 
 if test -z "$1" -o x"$1" = x'bdb'; then
-  if [ "${BITCOINDJS_ENV}" == "test" ]; then
+  if [ "${BITCORENODE_ENV}" == "test" ]; then
     echo -n "${artifacts_dir}/lib/libdb_cxx.a"
   fi
 fi
@@ -154,7 +154,7 @@ if test -z "$1" -o x"$1" = x'load_archive'; then
   if [ "${os}"  == "osx" ]; then
     echo -n "-Wl,-all_load -Wl,--no-undefined"
   else
-    echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${BITCOIN_DIR}"/src/.libs/libbitcoind.a -Wl,--no-whole-archive"
+    echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${artifacts_dir}"/lib/libbitcoind.a -Wl,--no-whole-archive"
   fi
 fi
 
@@ -168,5 +168,5 @@ if test -z "$1" -o x"$1" = x'mac_dependencies'; then
 fi
 
 if test -z "$1" -o x"$1" = x'bitcoind'; then
-  echo -n "${BITCOIN_DIR}"/src/.libs/libbitcoind.a
+  echo -n "${artifacts_dir}"/lib/libbitcoind.a
 fi