diff --git a/system/hostname b/system/hostname
index c6d1f819451..61bdf985b99 100644
--- a/system/hostname
+++ b/system/hostname
@@ -150,7 +150,7 @@ class DebianStrategy(GenericStrategy):
             try:
                 open(self.HOSTNAME_FILE, "a").write("")
             except IOError, err:
-                self.module.fail_json(msg="failed to write file: %s" % 
+                self.module.fail_json(msg="failed to write file: %s" %
                     str(err))
         try:
             f = open(self.HOSTNAME_FILE)
@@ -183,6 +183,11 @@ class UbuntuHostname(Hostname):
     distribution = 'Ubuntu'
     strategy_class = DebianStrategy
 
+class LinaroHostname(Hostname):
+    platform = 'Linux'
+    distribution = 'Linaro'
+    strategy_class = DebianStrategy
+
 # ===========================================
 
 class RedHatStrategy(GenericStrategy):
@@ -260,7 +265,7 @@ class ScientificLinuxHostname(Hostname):
     platform = 'Linux'
     distribution = 'Scientific'
     strategy_class = RedHatStrategy
-    
+
 # ===========================================
 
 class FedoraStrategy(GenericStrategy):