diff --git a/.travis.yml b/.travis.yml
index 5b0f5095..edcb8607 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,6 @@ addons:
 node_js:
   - "v0.12.7"
   - "v4"
-before_install:
-  - git config --global user.email "dev@bitpay.com"
-  - git config --global user.name "BitPay, Inc."
 script:
   - _mocha -R spec integration/regtest.js
   - _mocha -R spec integration/regtest-node.js
diff --git a/bin/patch-bitcoin b/bin/patch-bitcoin
index c17c46e5..aeaab6b1 100755
--- a/bin/patch-bitcoin
+++ b/bin/patch-bitcoin
@@ -23,6 +23,13 @@ git checkout -b "libbitcoind-$(date '+%Y.%m.%d')" || exit 1
 patch -p1 < "$patch_file" || exit 1
 
 git add --all || exit 1
+
+[ -n "$( git config user.name )" ] \
+    || git config user.name 'Bitcore Build'
+
+[ -n "$( git config user.email )" ] \
+    || git config user.email "$( id -n -u )@$( hostname -f )"
+
 git commit -a -m 'allow compiling of libbitcoind.so.' || exit 1
 
 echo 'Patch completed successfully.'
diff --git a/docs/build.md b/docs/build.md
index fe77a420..1846356f 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -6,8 +6,6 @@ If git is not already installed, it can be installed by running:
 
 ```bash
 sudo apt-get install git
-git config --global user.email "you@example.com"
-git config --global user.name "Your Name"
 ```
 
 If Node.js v0.12 isn't installed, it can be installed using "nvm", it can be done by following the installation script at [https://github.com/creationix/nvm#install-script](https://github.com/creationix/nvm#install-script) and then install version v0.12