diff --git a/from-havana/upgrade-horizon b/from-havana/upgrade-horizon
new file mode 100755
index 00000000..6b310c8c
--- /dev/null
+++ b/from-havana/upgrade-horizon
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# ``upgrade-horizon``
+
+configure_horizon_upgrade(){
+    set -o xtrace
+    # nothing to see here yet
+    set +o xtrace
+}
+
diff --git a/grenade.sh b/grenade.sh
index 5ae94349..2ac6064e 100755
--- a/grenade.sh
+++ b/grenade.sh
@@ -280,6 +280,11 @@ if [[ "$RUN_TARGET" == "True" ]]; then
         stop $STOP upgrade-tempest 290
     fi
 
+    # Upgrade Horizon
+    echo_summary "Running upgrade-horizon"
+    $GRENADE_DIR/upgrade-horizon || die $LINENO "Failure in upgrade-horizon"
+    stop $STOP upgrade-horizon 240
+
     # Upgrade Checks
     echo_summary "Running upgrade sanity check"
     $GRENADE_DIR/check-sanity || die $LINENO "Failure in check-sanity"
diff --git a/upgrade-horizon b/upgrade-horizon
new file mode 100755
index 00000000..d480e068
--- /dev/null
+++ b/upgrade-horizon
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+# ``upgrade-horizon``
+
+echo "*********************************************************************"
+echo "Begin $0"
+echo "*********************************************************************"
+
+# Clean up any resources that may be in use
+cleanup() {
+    set +o errexit
+
+    echo "*********************************************************************"
+    echo "ERROR: Abort $0"
+    echo "*********************************************************************"
+
+    # Kill ourselves to signal any calling process
+    trap 2; kill -2 $$
+}
+
+trap cleanup SIGHUP SIGINT SIGTERM
+
+# Keep track of the grenade directory
+GRENADE_DIR=$(cd $(dirname "$0") && pwd)
+
+# Import common functions
+source $GRENADE_DIR/functions
+
+# Determine what system we are running on.  This provides ``os_VENDOR``,
+# ``os_RELEASE``, ``os_UPDATE``, ``os_PACKAGE``, ``os_CODENAME``
+# and ``DISTRO``
+GetDistro
+
+# Source params
+source $GRENADE_DIR/grenaderc
+
+# This script exits on an error so that errors don't compound and you see
+# only the first error that occurred.
+set -o errexit
+
+# Print the commands being run so that we can see the command that triggers
+# an error.  It is also useful for following allowing as the install occurs.
+set -o xtrace
+
+# Set for DevStack compatibility
+TOP_DIR=$TARGET_DEVSTACK_DIR
+
+
+# Upgrade Horizon
+# ================
+
+# Get functions from current DevStack
+source $TARGET_DEVSTACK_DIR/stackrc
+source $TARGET_DEVSTACK_DIR/lib/horizon
+source $TARGET_DEVSTACK_DIR/lib/apache
+
+
+# stop horizon apache server
+stop_horizon
+# Kill horizon screen session
+screen -S $SCREEN_NAME -p horizon -X kill
+
+# Save current config files for posterity
+#TODO
+
+# install_horizon()
+install_horizon
+
+# calls upgrade-horizon for specific release
+upgrade_project horizon $GRENADE_DIR $BASE_DEVSTACK_BRANCH
+
+# Start Horizon
+start_horizon
+
+set +o xtrace
+echo "*********************************************************************"
+echo "SUCCESS: End $0"
+echo "*********************************************************************"