diff --git a/guac-install-server.sh b/guac-install-server.sh
index 7933f4c..30e0f3e 100644
--- a/guac-install-server.sh
+++ b/guac-install-server.sh
@@ -41,17 +41,6 @@ then
     exit
 fi
 
-# Hack for gcc7
-if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
-then
-    apt-get -y install gcc-6
-    if [ $? -ne 0 ]
-    then
-        echo "apt-get failed to install gcc-6"
-        exit
-    fi
-fi
-
 # Set SERVER to be the preferred download server from the Apache CDN
 SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}"
 
@@ -71,9 +60,25 @@ mkdir /etc/guacamole
 
 # Install guacd
 cd guacamole-server-${GUACVERSION}
-CC="gcc-6" ./configure --with-init-dir=/etc/init.d
-CC="gcc-6" make
-CC="gcc-6" make install
+
+# Hack for gcc7
+if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
+then
+    apt-get -y install gcc-6
+    if [ $? -ne 0 ]
+    then
+        echo "apt-get failed to install gcc-6"
+        exit
+    fi
+    CC="gcc-6" ./configure --with-init-dir=/etc/init.d
+    CC="gcc-6" make
+    CC="gcc-6" make install
+else
+    ./configure --with-init-dir=/etc/init.d
+    make
+    make install
+fi
+
 ldconfig
 cd ..
 
diff --git a/guac-install.sh b/guac-install.sh
index 7c422e8..7284bc2 100644
--- a/guac-install.sh
+++ b/guac-install.sh
@@ -104,17 +104,6 @@ if [ $? -ne 0 ]; then
     exit
 fi
 
-# Hack for gcc7
-if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
-then
-    apt-get -y install gcc-6
-    if [ $? -ne 0 ]
-    then
-        echo "apt-get failed to install gcc-6"
-        exit
-    fi
-fi
-
 # Set SERVER to be the preferred download server from the Apache CDN
 SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}"
 
@@ -150,11 +139,27 @@ tar -xzf guacamole-auth-jdbc-${GUACVERSION}.tar.gz
 mkdir -p /etc/guacamole/lib
 mkdir -p /etc/guacamole/extensions
 
-# Install guacd # Hack for gcc7 #
+# Install guacd
 cd guacamole-server-${GUACVERSION}
-CC="gcc-6" ./configure --with-init-dir=/etc/init.d
-CC="gcc-6" make
-CC="gcc-6" make install
+
+# Hack for gcc7
+if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
+then
+    apt-get -y install gcc-6
+    if [ $? -ne 0 ]
+    then
+        echo "apt-get failed to install gcc-6"
+        exit
+    fi
+    CC="gcc-6" ./configure --with-init-dir=/etc/init.d
+    CC="gcc-6" make
+    CC="gcc-6" make install
+else
+    ./configure --with-init-dir=/etc/init.d
+    make
+    make install
+fi
+
 ldconfig
 systemctl enable guacd
 cd ..
diff --git a/guac-upgrade.sh b/guac-upgrade.sh
index 55d3775..a690894 100644
--- a/guac-upgrade.sh
+++ b/guac-upgrade.sh
@@ -72,18 +72,28 @@ if [ $? -ne 0 ]; then
     exit
 fi
 
-# Hack for gcc7
-if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
-then
-    apt-get -y install gcc-6
-fi
-
 # Upgrade Guacamole Server
 tar -xzf guacamole-server-${GUACVERSION}.tar.gz
 cd guacamole-server-${GUACVERSION}
-CC="gcc-6" ./configure --with-init-dir=/etc/init.d
-CC="gcc-6" make
-CC="gcc-6" make install
+
+# Hack for gcc-7
+if [[ $(gcc --version | head -n1 | grep -oP '\)\K.*' | awk '{print $1}' | grep "^7" | wc -l) -gt 0 ]]
+then
+    apt-get -y install gcc-6
+    if [ $? -ne 0 ]
+    then
+        echo "apt-get failed to install gcc-6"
+        exit
+    fi
+    CC="gcc-6" ./configure --with-init-dir=/etc/init.d
+    CC="gcc-6" make
+    CC="gcc-6" make install
+else
+    ./configure --with-init-dir=/etc/init.d
+    make
+    make install
+fi
+
 ldconfig
 systemctl enable guacd
 cd ..