diff --git a/NEWS b/NEWS
index 2e44ccf..79e16cc 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Bug fixes:
 * Fixed an exploit in QDB that allowed users to use services fantasy commands
   with the bot's account.
 * Fixed a bug in LinkTitle that caused multi-line <title>'s to display wrong.
+* Fixed a bug in UNO that allowed users to join more than once.
 
 Incompatibilities:
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ef9c452..a03304d 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Fixed a bug in UNO that allowed users to join more than once.
     * Added optional uno:english option. See documentation for UNO.
     * UNO has a new config option, uno:msg, for setting what method the bot
       uses for private messages.
diff --git a/modules/UNO.pm b/modules/UNO.pm
index 7badde3..bb98278 100644
--- a/modules/UNO.pm
+++ b/modules/UNO.pm
@@ -158,6 +158,12 @@ sub cmd_uno {
                 }
             }
 
+            # Ensure the user is not already playing.
+            if (defined $PLAYERS{lc $src->{nick}}) {
+                sendmsg($src->{svr}, $src->{nick}, 'You\'re already playing.');
+                return;
+            }
+
             # Update variables.
             $PLAYERS{lc $src->{nick}} = []; 
             $NICKS{lc $src->{nick}} = $src->{nick};
@@ -1350,7 +1356,7 @@ sub sendmsg {
 }
 
 # Start initialization.
-API::Std::mod_init('UNO', 'Xelhua', '1.07', '3.0.0a8', __PACKAGE__);
+API::Std::mod_init('UNO', 'Xelhua', '1.08', '3.0.0a8', __PACKAGE__);
 # build: perl=5.010000
 
 __END__
@@ -1361,7 +1367,7 @@ UNO - Three editions of the UNO card game
 
 =head1 VERSION
 
- 1.07
+ 1.08
 
 =head1 SYNOPSIS