diff --git a/docs/installation.md b/docs/installation.md
index 4a2450ea2..5cc0e03f4 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -114,7 +114,7 @@ OS Specific steps are listed first, the [Common](#common) section below is neces
     ``` bash
     sudo apt-get install python3-venv libatlas-base-dev
     # Use pywheels.org to speed up installation
-    sudo echo "[global]\nextra-index-url=https://www.piwheels.org/simple" > sudo tee /etc/pip.conf
+    sudo echo "[global]\nextra-index-url=https://www.piwheels.org/simple" > tee /etc/pip.conf
 
     git clone https://github.com/freqtrade/freqtrade.git
     cd freqtrade
diff --git a/setup.sh b/setup.sh
index 83ba42d9b..8896331e3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -56,6 +56,7 @@ function updateenv() {
         exit 1
     fi
     source .env/bin/activate
+    SYS_ARCH=$(uname -m)
     echo "pip install in-progress. Please wait..."
     ${PYTHON} -m pip install --upgrade pip
     read -p "Do you want to install dependencies for dev [y/N]? "
@@ -65,12 +66,21 @@ function updateenv() {
     else
         REQUIREMENTS=requirements.txt
     fi
-    SYS_ARCH=$(uname -m)
+    REQUIREMENTS_HYPEROPT=""
+    if [ "${SYS_ARCH}" != "armv7l" ]; then
+        # Is not Raspberry
+        read -p "Do you want to install hyperopt dependencies for dev [y/N]? "
+        if [[ $REPLY =~ ^[Yy]$ ]]
+        then
+            REQUIREMENTS_HYPEROPT="-r requirements-hyperopt.txt"
+        fi
+    fi
+
     if [ "${SYS_ARCH}" == "armv7l" ]; then
         echo "Detected Raspberry, installing cython."
         ${PYTHON} -m pip install --upgrade cython
     fi
-    ${PYTHON} -m pip install --upgrade -r ${REQUIREMENTS}
+    ${PYTHON} -m pip install --upgrade -r ${REQUIREMENTS} ${REQUIREMENTS_HYPEROPT}
     if [ $? -ne 0 ]; then
         echo "Failed installing dependencies"
         exit 1