diff --git a/ChangeLog b/ChangeLog
index 9f401b22f..b51d6a524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+	* Added 'roulette' command to Fun plugin.
+	
 	* Added a Channel.lobotomies command to list the channels in which
 	the bot is lobotomized.
 	
diff --git a/plugins/Fun.py b/plugins/Fun.py
index 9e5e58421..448e40430 100644
--- a/plugins/Fun.py
+++ b/plugins/Fun.py
@@ -502,6 +502,22 @@ class Fun(callbacks.Privmsg):
         s = self._scrambleRe.sub(_subber, text)
         irc.reply(msg, s)
 
+    def roulette(self, irc, msg, args):
+        """takes no arguments.
+
+        Randomly picks a number from 1 to 6 and if it comes up 1, you get
+        kicked.  Otherwise -- *click*
+        """
+        nick = msg.nick
+        channel = msg.args[0]
+        if random.randint(1, 6) == 1:
+            irc.queueMsg(ircmsgs.kick(channel, nick))
+        else:
+            irc.reply(msg, '*click*')
+
+
+
+
     _code = {
         "A" : ".-",
         "B" : "-...",