diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 391941522..54132f268 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -742,6 +742,17 @@ command { service = "ChanServ"; name = "TOPIC"; command = "chanserv/topic"; }
 module { name = "cs_unban" }
 command { service = "ChanServ"; name = "UNBAN"; command = "chanserv/unban"; }
 
+/*
+ * cs_updown
+ *
+ * Provides the commands chanserv/up and chanserv/down.
+ *
+ * Used for setting or removing your status modes on a channel.
+ */
+module { name = "cs_updown" }
+command { service = "ChanServ"; name = "DOWN"; command = "chanserv/down"; }
+command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; }
+
 /*
  * cs_xop
  *
diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
new file mode 100644
index 000000000..a3848c393
--- /dev/null
+++ b/modules/commands/cs_updown.cpp
@@ -0,0 +1,130 @@
+/* ChanServ core functions
+ *
+ * (C) 2003-2011 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ *
+ * Based on the original code of Epona by Lara.
+ * Based on the original code of Services by Andy Church.
+ */
+
+/*************************************************************************/
+
+#include "module.h"
+
+class CommandCSUp : public Command
+{
+ public:
+	CommandCSUp(Module *creator) : Command(creator, "chanserv/up", 0, 1)
+	{
+		this->SetDesc(_("Updates your status on a channel"));
+		this->SetSyntax(_("[\037channel\037]"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	{
+		User *u = source.u;
+
+		if (params.empty())
+			for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+			{
+				Channel *c = (*it)->chan;
+				chan_set_correct_modes(u, c, 1);
+			}
+		else
+		{
+			const Anope::string &channel = params[0];
+			Channel *c = findchan(params[0]);
+			
+			if (c == NULL)
+				source.Reply(CHAN_X_NOT_IN_USE, channel.c_str());
+			else if (c->ci == NULL)
+				source.Reply(CHAN_X_NOT_REGISTERED, channel.c_str());
+			else
+				chan_set_correct_modes(u, c, 1);
+		}
+
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	{
+		this->SendSyntax(source);
+		source.Reply(" ");
+		source.Reply(_("Updates your status modes on a channel. If \037channel\037 is ommited\n"
+				"your channel status is updated on every channel you are in."));
+		return true;
+	}
+};
+
+class CommandCSDown : public Command
+{
+	void RemoveAll(User *u, Channel *c)
+	{
+		for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+		{
+			ChannelMode *cm = ModeManager::ChannelModes[i];
+
+			if (cm != NULL && cm->Type == MODE_STATUS)
+				c->RemoveMode(NULL, cm, u->nick);
+		}
+	}
+
+ public:
+	CommandCSDown(Module *creator) : Command(creator, "chanserv/down", 0, 1)
+	{
+		this->SetDesc(_("Removes your status from a channel"));
+		this->SetSyntax(_("[\037channel\037]"));
+	}
+
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	{
+		User *u = source.u;
+
+		if (params.empty())
+			for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+			{
+				Channel *c = (*it)->chan;
+				RemoveAll(u, c);
+			}
+		else
+		{
+			const Anope::string &channel = params[0];
+			Channel *c = findchan(params[0]);
+			
+			if (c == NULL)
+				source.Reply(CHAN_X_NOT_IN_USE, channel.c_str());
+			else if (c->ci == NULL)
+				source.Reply(CHAN_X_NOT_REGISTERED, channel.c_str());
+			else
+				RemoveAll(u, c);
+		}
+	}
+
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	{
+		this->SendSyntax(source);
+		source.Reply(" ");
+		source.Reply(_("Removes your status modes on a channel. If \037channel\037 is ommited\n"
+				"your channel status is remove on every channel you are in."));
+		return true;
+	}
+};
+
+class CSUpDown : public Module
+{
+	CommandCSUp commandcsup;
+	CommandCSDown commandcsdown;
+
+ public:
+	CSUpDown(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
+		commandcsup(this), commandcsdown(this)
+	{
+		this->SetAuthor("Anope");
+
+		ModuleManager::RegisterService(&commandcsup);
+		ModuleManager::RegisterService(&commandcsdown);
+	}
+};
+
+MODULE_INIT(CSUpDown)