diff --git a/kippo/commands/uname.py b/kippo/commands/uname.py
index 21227d41..5070fa42 100644
--- a/kippo/commands/uname.py
+++ b/kippo/commands/uname.py
@@ -12,6 +12,8 @@ class command_uname(HoneyPotCommand):
                 self.honeypot.hostname)
         elif len(self.args) and self.args[0].strip() in ('-r', '--kernel-release'):
             self.writeln( '2.6.26-2-686' )
+        elif len(self.args) and self.args[0].strip() in ('-m', '--machine'):
+            self.writeln( 'i686' )
         else:
             self.writeln('Linux')