diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
index bd7ef05c8..cbf2cfec4 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -891,6 +891,16 @@ else if (msg.startsWith("/me "))
             final String command = message.substring(4);
             irc.act(source, command);
         }
+        else if (msg.startsWith("/join "))
+        {
+            final String channel = message.substring(6);
+            // TODO Add \0 to regex check for correct channel naming.
+            // TODO Add support for providing password for channel.
+            if (channel.matches("[^,\\n\\r\\s\\a]+"))
+            {
+                irc.joinChannel(channel);
+            }
+        }
         else
         {
             irc.message(source, message);