--- a/teh-lol.pl
+++ b/teh-lol.pl
@@ -48,6 +48,17 @@
   close(FILE);
 }
 
+## Advanced lollists have attempted alternative lols, so let's catch
+## those too.
+my $l = "[lI1|]";
+my $o = "[oо0]";
+
+# | counts as a word boundary, so now we need generalised word
+# boundaries to exclude |
+my $b = "(?:\b|\|)";
+
+
+
 sub check_lol {
   my @xchat_args = @{$_[0]};
   my $chatter = $xchat_args[0];
@@ -62,17 +73,20 @@
   ## Match stuff like "lol", "loool" and "lololol". Also mimic
   ## punctuation.
 
-  if ($msg =~ /\b(l                ## Starting l, capture it in $1
-
-                 ((?:o|(?<!l)lo)+) ## either a single "o" or an "o"
-                                   ## followed by a bunch of "lolo",
-                                   ## capture it in $2
+  if ($msg =~ /$b(
+                 ## Starting l, capture it in $1
+                 $l
 
-                 l)                ## closing l
+                 ## either a single "o" or an "o" followed by a bunch
+                 ## of "lolo", capture it in $2
+                 ((?:$o|(?<!$l)$l$o)+)
 
-                 ([\.!?]+|\b)      ## Final punctuation or word
-                                   ## boundary, capture it in $3
-               /ix
+                 ## closing l
+                 $l)
+
+               ## Final punctuation or word boundary, capture it in $3
+               ([\.!?]+|$b)
+              /ix
 
       #Two minutes of not saying anything in the channel counts as
       #idling, so don't pester when idling.
@@ -147,7 +161,7 @@
 
   ## Allow "lol stuff" and e.g. "JordiGH: lol stuff" to be part of a
   ## lolcombo
-  my $islol = $msg =~ /^\s*($nick.?\s*)?l((o|(?<!l)lo)+)l\b/i;
+  my $islol = $msg =~ /^\s*($nick.?\s*)?$l(($o|(?<!$l)$l$o)+)$l$b/i;
 
   if(not $islol) {
     my $combo = $combo_count{$chan};