diff --git a/advanced/Scripts/updatecheck.sh b/advanced/Scripts/updatecheck.sh
new file mode 100755
index 00000000..9b79c4cb
--- /dev/null
+++ b/advanced/Scripts/updatecheck.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2017 Pi-hole, LLC (https://pi-hole.net)
+# Network-wide ad blocking via your own hardware.
+#
+# Checks for updates via GitHub
+#
+# This file is copyright under the latest version of the EUPL.
+# Please see LICENSE file for your rights under this license.
+
+# Credit: https://stackoverflow.com/a/46324904
+function json_extract() {
+  local key=$1
+  local json=$2
+
+  local string_regex='"([^"\]|\\.)*"'
+  local number_regex='-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?'
+  local value_regex="${string_regex}|${number_regex}|true|false|null"
+  local pair_regex="\"${key}\"[[:space:]]*:[[:space:]]*(${value_regex})"
+
+  if [[ ${json} =~ ${pair_regex} ]]; then
+    echo $(sed 's/^"\|"$//g' <<< "${BASH_REMATCH[1]}")
+  else
+    return 1
+  fi
+}
+
+GITHUB_CORE_VERSION="$(json_extract tag_name "$(curl -q 'https://api.github.com/repos/pi-hole/pi-hole/releases/latest' 2> /dev/null)")"
+GITHUB_WEB_VERSION="$(json_extract tag_name "$(curl -q 'https://api.github.com/repos/pi-hole/AdminLTE/releases/latest' 2> /dev/null)")"
+GITHUB_FTL_VERSION="$(json_extract tag_name "$(curl -q 'https://api.github.com/repos/pi-hole/FTL/releases/latest' 2> /dev/null)")"
+
+echo "${GITHUB_CORE_VERSION} ${GITHUB_WEB_VERSION} ${GITHUB_FTL_VERSION}" > "/etc/pihole/GitHubVersions"
+
+function get_local_branch() {
+  # Return active branch
+  cd "${1}" 2> /dev/null || return 1
+  git rev-parse --abbrev-ref HEAD || return 1
+}
+
+CORE_BRANCH="$(get_local_branch /etc/.pihole)"
+WEB_BRANCH="$(get_local_branch /var/www/html/admin)"
+#FTL_BRANCH="$(pihole-FTL branch)"
+# Don't store FTL branch until the next release of FTL which
+# supports returning the branch in an easy way
+FTL_BRANCH="XXX"
+
+echo "${CORE_BRANCH} ${WEB_BRANCH} ${FTL_BRANCH}" > "/etc/pihole/localbranches"
+
+function get_local_version() {
+  # Return active branch
+  cd "${1}" 2> /dev/null || return 1
+  git describe --long --dirty --tags || return 1
+}
+
+CORE_VERSION="$(get_local_version /etc/.pihole)"
+WEB_VERSION="$(get_local_version /var/www/html/admin)"
+FTL_VERSION="$(pihole-FTL version)"
+
+echo "${CORE_VERSION} ${WEB_VERSION} ${FTL_VERSION}" > "/etc/pihole/localversions"
diff --git a/advanced/pihole.cron b/advanced/pihole.cron
index bb0d20d8..2273358b 100644
--- a/advanced/pihole.cron
+++ b/advanced/pihole.cron
@@ -28,3 +28,6 @@
 00 00   * * *   root    PATH="$PATH:/usr/local/bin/" pihole flush once quiet
 
 @reboot root /usr/sbin/logrotate /etc/pihole/logrotate
+
+# Pi-hole: Grab remote version and branch every 10 minutes
+*/10 *  * * *   root    PATH="$PATH:/usr/local/bin/" pihole updatechecker
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 647661f8..5015f0fd 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -2079,6 +2079,9 @@ main() {
   # Download and compile the aggregated block list
   runGravity
 
+  # Force an update of the updatechecker
+  . /opt/pihole/updatecheck.sh
+
   #
   if [[ "${useUpdateVars}" == false ]]; then
       displayFinalMessage "${pw}"
diff --git a/pihole b/pihole
index d37083f8..652f4acb 100755
--- a/pihole
+++ b/pihole
@@ -582,6 +582,11 @@ tricorderFunc() {
   fi
 }
 
+updateCheckFunc() {
+  "${PI_HOLE_SCRIPT_DIR}"/updatecheck.sh "$@"
+  exit 0
+}
+
 helpFunc() {
   echo "Usage: pihole [options]
 Example: 'pihole -w -h'
@@ -653,5 +658,6 @@ case "${1}" in
   "-t" | "tail"                 ) tailFunc;;
   "checkout"                    ) piholeCheckoutFunc "$@";;
   "tricorder"                   ) tricorderFunc;;
+  "updatechecker"               ) updateCheckFunc;;
   *                             ) helpFunc;;
 esac