diff --git a/modules/extra/flooddetach.cpp b/modules/extra/flooddetach.cpp
new file mode 100644
index 00000000..0352b072
--- /dev/null
+++ b/modules/extra/flooddetach.cpp
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2004-2009  See the AUTHORS file for details.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "Chan.h"
+#include "Modules.h"
+#include "User.h"
+
+class CFloodDetachMod : public CModule {
+public:
+	MODCONSTRUCTOR(CFloodDetachMod) {
+		m_iThresholdSecs = 0;
+		m_iThresholdMsgs = 0;
+	}
+
+	~CFloodDetachMod() {
+	}
+
+	void Save() {
+		// We save the settings twice because the module arguments can
+		// be more easily edited via webadmin, while the SetNV() stuff
+		// survives e.g. /msg *status reloadmod ctcpflood.
+		SetNV("secs", CString(m_iThresholdSecs));
+		SetNV("msgs", CString(m_iThresholdMsgs));
+
+		SetArgs(CString(m_iThresholdMsgs) + " " + CString(m_iThresholdSecs));
+	}
+
+	bool OnLoad(const CString& sArgs, CString& sMessage) {
+		m_iThresholdMsgs = sArgs.Token(0).ToUInt();
+		m_iThresholdSecs = sArgs.Token(1).ToUInt();
+
+		if (m_iThresholdMsgs == 0 || m_iThresholdSecs == 0) {
+			m_iThresholdMsgs = GetNV("msgs").ToUInt();
+			m_iThresholdSecs = GetNV("secs").ToUInt();
+		}
+
+		if (m_iThresholdSecs == 0)
+			m_iThresholdSecs = 2;
+		if (m_iThresholdMsgs == 0)
+			m_iThresholdMsgs = 5;
+
+		Save();
+
+		return true;
+	}
+
+	void OnIRCDisconnected() {
+		m_chans.clear();
+	}
+
+	void Cleanup() {
+		Limits::iterator it;
+		time_t now = time(NULL);
+
+		for (it = m_chans.begin(); it != m_chans.end(); it++) {
+			// The timeout for this channel did not expire yet?
+			if (it->second.first + m_iThresholdSecs >= now)
+				continue;
+
+			CChan *pChan = m_pUser->FindChan(it->first);
+			if (it->second.second >= m_iThresholdMsgs
+					&& pChan && pChan->IsDetached()) {
+				// The channel is detached and it is over the
+				// messages limit. Since we only track those
+				// limits for non-detached channels or for
+				// channels which we detached, this means that
+				// we detached because of a flood.
+
+				PutModule("Flood in [" + pChan->GetName() + "] is over, "
+						"re-attaching...");
+				// No buffer playback, makes sense, doesn't it?
+				pChan->ClearBuffer();
+				pChan->JoinUser();
+			}
+
+			Limits::iterator it2 = it++;
+			m_chans.erase(it2);
+
+			// Without this Bad Things (tm) could happen
+			if (it == m_chans.end())
+				break;
+		}
+	}
+
+	void Message(CChan& Channel) {
+		Limits::iterator it;
+		time_t now = time(NULL);
+
+		// First: Clean up old entries and reattach where necessary
+		Cleanup();
+
+		it = m_chans.find(Channel.GetName());
+
+		if (it == m_chans.end()) {
+			// We don't track detached channels
+			if (Channel.IsDetached())
+				return;
+		
+			// This is the first message for this channel, start a
+			// new timeout.
+			std::pair<time_t, unsigned int> tmp(now, 1);
+			m_chans[Channel.GetName()] = tmp;
+			return;
+		}
+
+		// No need to check it->second.first (expiry time), since
+		// Cleanup() would have removed it if it was expired.
+
+		if (it->second.second >= m_iThresholdMsgs) {
+			// The channel already hit the limit and we detached the
+			// user, but it is still being flooded, reset the timeout
+			it->second.first = now;
+			it->second.second++;
+			return;
+		}
+
+		it->second.second++;
+
+		if (it->second.second < m_iThresholdMsgs)
+			return;
+
+		// The channel hit the limit, reset the timeout so that we keep
+		// it detached for longer.
+		it->second.first = now;
+
+		Channel.DetachUser();
+		PutModule("Channel [" + Channel.GetName() + "] was "
+				"flooded, you've been detached");
+	}
+
+	EModRet OnChanMsg(CNick& Nick, CChan& Channel, CString& sMessage) {
+		Message(Channel);
+		return CONTINUE;
+	}
+
+	// This also catches OnChanAction()
+	EModRet OnChanCTCP(CNick& Nick, CChan& Channel, CString& sMessage) {
+		Message(Channel);
+		return CONTINUE;
+	}
+
+	EModRet OnChanNotice(CNick& Nick, CChan& Channel, CString& sMessage) {
+		Message(Channel);
+		return CONTINUE;
+	}
+
+	EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic) {
+		Message(Channel);
+		return CONTINUE;
+	}
+
+	void OnModCommand(const CString& sCommand) {
+		const CString& sCmd = sCommand.Token(0);
+		const CString& sArg = sCommand.Token(1, true);
+
+		if (sCmd.Equals("secs") && !sArg.empty()) {
+			m_iThresholdSecs = sArg.ToUInt();
+			if (m_iThresholdSecs == 0)
+				m_iThresholdSecs = 1;
+
+			PutModule("Set seconds limit to [" + CString(m_iThresholdSecs) + "]");
+			Save();
+		} else if (sCmd.Equals("lines") && !sArg.empty()) {
+			m_iThresholdMsgs = sArg.ToUInt();
+			if (m_iThresholdMsgs == 0)
+				m_iThresholdMsgs = 2;
+
+			PutModule("Set lines limit to [" + CString(m_iThresholdMsgs) + "]");
+			Save();
+		} else if (sCmd.Equals("show")) {
+			PutModule("Current limit is " + CString(m_iThresholdMsgs) + " lines "
+					"in " + CString(m_iThresholdSecs) + " secs.");
+		} else {
+			PutModule("Commands: show, secs <limit>, lines <limit>");
+		}
+	}
+private:
+	typedef map<CString, std::pair<time_t, unsigned int> > Limits;
+	Limits m_chans;
+	unsigned int m_iThresholdSecs;
+	unsigned int m_iThresholdMsgs;
+};
+
+MODULEDEFS(CFloodDetachMod, "Detach channels when flooded")