diff --git a/arduino/manifests/init.pp b/arduino/manifests/init.pp
index dad2a33..a6addbb 100644
--- a/arduino/manifests/init.pp
+++ b/arduino/manifests/init.pp
@@ -13,8 +13,8 @@ class arduino {
     }
 
     if !$arduino_package {
-        case $architecture {
-            "x86_64": {
+        case $::architecture {
+            "amd64","x86_64": {
                 if $arduino64_package_latest {
                     $arduino_package = $arduino64_package_latest
                 } else {
diff --git a/ia32libs/manifests/init.pp b/ia32libs/manifests/init.pp
index 40d9c5c..b0500d3 100644
--- a/ia32libs/manifests/init.pp
+++ b/ia32libs/manifests/init.pp
@@ -2,11 +2,13 @@
 #
 class ia32libs {
 
-    if $architecture == "x86_64" {
-        case $::operatingsystem {
-            ubuntu: {
-                package { "ia32-libs":
-                    ensure => installed,
+    case $::architecture {
+        "amd64","x86_64": {
+            case $::operatingsystem {
+                "ubuntu": {
+                    package { "ia32-libs":
+                        ensure => installed,
+                    }
                 }
             }
         }
diff --git a/phantomjs/manifests/init.pp b/phantomjs/manifests/init.pp
index 0e7867f..500878a 100644
--- a/phantomjs/manifests/init.pp
+++ b/phantomjs/manifests/init.pp
@@ -3,8 +3,8 @@
 class phantomjs {
 
     if !$phantomjs_package {
-        case $architecture {
-            "x86_64": {
+        case $::architecture {
+            "amd64","x86_64": {
                 if $phantomjs64_package_latest {
                     $phantomjs_package = $phantomjs64_package_latest
                 } else {
diff --git a/teamspeak/manifests/init.pp b/teamspeak/manifests/init.pp
index a612a7d..2cff261 100644
--- a/teamspeak/manifests/init.pp
+++ b/teamspeak/manifests/init.pp
@@ -8,8 +8,8 @@
 class teamspeak {
 
     if !$teamspeak_package {
-        case $architecture {
-            "x86_64": {
+        case $::architecture {
+            "amd64","x86_64": {
                 if $teamspeak64_package_latest {
                     $teamspeak_package = $teamspeak64_package_latest
                 } else {
@@ -26,8 +26,8 @@ class teamspeak {
         }
     }
 
-    case $architecture {
-        "x86_64": {
+    case $::architecture {
+        "amd64","x86_64": {
             $teamspeak_bin = "/usr/local/teamspeak/ts3server_linux_amd64"
         }
         default: {