diff --git a/Changes b/Changes
index d1798801..5370080a 100644
--- a/Changes
+++ b/Changes
@@ -10,6 +10,8 @@ Revision history for Perl extension POE::Component::IRC.
       synced (Hinrik)
     - In jailed environments we can't assume that 127.0.0.1 will be that.
       reported by Jase Thew (Bazerka).
+    - Logger.pm: Replace slashes with underscores before logging to disk,
+      spotted by Sebastian Mair.
 
 6.05_01 Sat Apr 11 09:18:28 GMT 2009
     - Compat.pm: Don't emit an extra event or print a misleading debug message
diff --git a/lib/POE/Component/IRC/Plugin/Logger.pm b/lib/POE/Component/IRC/Plugin/Logger.pm
index 48ee0962..e18ad60e 100644
--- a/lib/POE/Component/IRC/Plugin/Logger.pm
+++ b/lib/POE/Component/IRC/Plugin/Logger.pm
@@ -375,6 +375,9 @@ sub _log_entry {
     }
 
     return if !defined $self->{Format}->{$type};
+
+    # slash is problematic in a filename, replace it with underscore
+    $context =~ s!/!_!g;
     
     my $log_file;
     if ($self->{Sort_by_date}) {