diff --git a/searchsploit b/searchsploit
index ee4eca905..0ab095ce0 100755
--- a/searchsploit
+++ b/searchsploit
@@ -1,6 +1,6 @@
 #!/bin/bash
 #       Name: SearchSploit - Exploit-DB's CLI search tool
-#    Version: 3.8.3 (Release date: 2017-08-29)
+#    Version: 3.8.4 (Release date: 2017-09-04)
 # Written by: Offensive Security, Unix-Ninja, and g0tmi1k
 #   Homepage: https://github.com/offensive-security/exploit-database
 #     Manual: https://www.exploit-db.com/searchsploit/
@@ -119,9 +119,9 @@ function update()
   fi
 
   # Update from homebrew (e.g. OSX)
-  brew install exploitdb 2>/dev/null >/dev/null
+  brew 2>/dev/null >/dev/null
   if [[ "$?" == "0" ]]; then
-    # This only really updates searchsploit
+    # This only really updates ./searchsploit
     updatedbrew
   fi
 
@@ -153,7 +153,7 @@ function updatedbrew()
 
   brew update \
     || echo -e '\n[-] Issue with brew update (Please check network connectivity).' 1>&2
-  brew upgrade exploitdb 2>/dev/null >/dev/null
+  brew upgrade exploitdb
 
   echo -e "\n[*] Brew update finished."
 }
@@ -181,19 +181,19 @@ function updategit()
   if [[ "$( git remote -v )" != *"${gitremote}"* ]]; then
     echo -e '\n[i] Missing Git remote:' "${gitremote}"
     git init >/dev/null
-    git remote add origin "${gitremote}" 2>/dev/null
+    git remote add upstream "${gitremote}" 2>/dev/null
   fi
 
   # Make sure to prep checkout first
   git checkout -- .
 
   # Update from git
-  git pull origin master
+  git pull upstream master
 
   # If conflicts, clean and try again
   if [[ "$?" -ne 0 ]]; then
     git clean -d -fx ""
-    git pull origin master
+    git pull upstream master
   fi
 
   echo -e "\n[*] Git update finished."