diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
index fc7c8ec6d..ee9305128 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
@@ -51,6 +51,7 @@ abstract class IRCFilter {
                 "KICK",
                 "H", // "hide operator status" (after kicking an op)
                 "TOPIC",
+                "AUTHENTICATE", // SASL, also requires CAP below
                 // http://tools.ietf.org/html/draft-mitchell-irc-capabilities-01
                 "CAP"
         };
@@ -152,6 +153,7 @@ abstract class IRCFilter {
                 // Commands that regular users might use
                 "ADMIN",
                 "AWAY",    // should be harmless
+                "AUTHENTICATE", // SASL, also requires CAP below
                 "CAP",     // http://tools.ietf.org/html/draft-mitchell-irc-capabilities-01
                 "CYCLE",
                 "DCCALLOW",
diff --git a/history.txt b/history.txt
index 94b60c518..594de5f6a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2013-04-25 str4d
+ * i2ptunnel: Allow the "AUTHENTICATE" command in IRC tunnels to enable SASL
+              authentication (ticket #904)
+
 2013-04-24 zzz
  * Console, i2ptunnel: Don't register shutdown hook if ClientAppManager is present
  * JettyStart: Fixes for use by plugins