diff --git a/manifests/sdk.pp b/manifests/sdk.pp
index 4e4effd..57e5079 100644
--- a/manifests/sdk.pp
+++ b/manifests/sdk.pp
@@ -56,15 +56,18 @@
   # For 64bit systems, we need to install some 32bit libraries for the SDK
   # to work.
   if ($::kernel == 'Linux') and ($::architecture == 'x86_64' or $::architecture == 'amd64') {
-    if $::lsbdistcodename == 'jessie' or $::lsbdistrelease == 14.04 {
-      ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
-    } else {
-      ensure_packages($::osfamily ? {
+    case $::lsbdistrelease {
+      '14.04','16.04': {
+        ensure_packages(['libc6-i386', 'lib32stdc++6', 'lib32gcc1', 'lib32ncurses5', 'lib32z1'])
+      }
+      default: {
+        ensure_packages($::osfamily ? {
         # list 64-bit version and use latest for installation too so that the same version is applied to both
         'RedHat' => ['glibc.i686','zlib.i686','libstdc++.i686','zlib','libstdc++'],
         'Debian' => ['ia32-libs'],
         default  => [],
-      })
-    }
+        })
+     }
+   }
   }
-}
+}
\ No newline at end of file
diff --git a/metadata.json b/metadata.json
index 42d275c..b1e8598 100644
--- a/metadata.json
+++ b/metadata.json
@@ -73,7 +73,8 @@
       "operatingsystemrelease": [
         "10.04",
         "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     },
     {