diff --git a/guac-install.sh b/guac-install.sh
index 89e5f9b..38a8abd 100644
--- a/guac-install.sh
+++ b/guac-install.sh
@@ -20,6 +20,9 @@ else
     JPEGTURBO="libjpeg62-turbo-dev"
 fi
 
+# Get architecture - 32 bit or 64 bit
+if [ $(getconf LONG_BIT | grep 64) ]; then ARCH="x86_64";  else ARCH="i386"; fi
+
 # Install Features
 apt-get update
 apt-get -y install build-essential libcairo2-dev $JPEGTURBO libpng12-dev libossp-uuid-dev libavcodec-dev libavutil-dev \
@@ -68,7 +71,7 @@ cd ..
 # Move files to correct locations
 mv guacamole-${VERSION}-incubating.war /etc/guacamole/guacamole.war
 ln -s /etc/guacamole/guacamole.war /var/lib/tomcat8/webapps/
-ln -s /usr/local/lib/freerdp/* /usr/lib/x86_64-linux-gnu/freerdp/.
+ln -s /usr/local/lib/freerdp/* /usr/lib/$ARCH-linux-gnu/freerdp/.
 cp mysql-connector-java-${MCJVERSION}/mysql-connector-java-${MCJVERSION}-bin.jar /etc/guacamole/lib/
 cp guacamole-auth-jdbc-${VERSION}-incubating/mysql/guacamole-auth-jdbc-mysql-${VERSION}-incubating.jar /etc/guacamole/extensions/
 
diff --git a/guac-upgrade.sh b/guac-upgrade.sh
index 8fd4080..2e56537 100644
--- a/guac-upgrade.sh
+++ b/guac-upgrade.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Version Numbers of Guacamole and MySQL Connection/J to download
 VERSION="0.9.13"
 MCJVERSION="5.1.43"