diff --git a/IRCSock.cpp b/IRCSock.cpp
index 81e0ac2e..f79e9ecd 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -576,15 +576,11 @@ void CIRCSock::ReadLine(const CString& sData) {
 					MODULECALL(OnKick(Nick.GetNickMask(), sKickedNick, *pChan, sMsg), m_pUser, NULL, );
 				}
 
-				if (GetNick().CaseCmp(sKickedNick) == 0) {
-					CString sKey;
+				if (GetNick().CaseCmp(sKickedNick) == 0 && pChan) {
+					pChan->SetIsOn(false);
 
-					if (pChan) {
-						sKey = pChan->GetKey();
-						pChan->SetIsOn(false);
-					}
-
-					PutIRC("JOIN " + sChan + " " + sKey);
+					// Don't try to rejoin!
+					pChan->Disable();
 				}
 
 				if ((pChan) && (pChan->IsDetached())) {
diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp
new file mode 100644
index 00000000..5a225525
--- /dev/null
+++ b/modules/kickrejoin.cpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2004-2007  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.
+ *
+ * This was originally written by cycomate.
+ *
+ * Autorejoin module
+ * rejoin channel (after a delay) when kicked
+ * Usage: LoadModule = rejoin [delay]
+ *
+ */
+#include <main.h>
+#include <Modules.h>
+#include <Chan.h>
+#include <User.h>
+
+class CRejoinJob: public CTimer {
+public:
+	CRejoinJob(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription)
+	: CTimer(pModule, uInterval, uCycles, sLabel, sDescription) {
+	}
+
+	virtual ~CRejoinJob() {}
+
+protected:
+	virtual void RunJob() {
+		CUser* user = m_pModule->GetUser();
+		CChan* pChan = user->FindChan(GetName().Token(1, true));
+
+		if (pChan) {
+			pChan->Enable();
+			GetModule()->PutIRC("JOIN " + pChan->GetName() + " " + pChan->GetKey());
+		}
+	}
+};
+
+class CRejoinMod : public CModule {
+private:
+	unsigned int delay;
+
+public:
+	MODCONSTRUCTOR(CRejoinMod) {}
+	virtual ~CRejoinMod() {}
+
+	virtual bool OnLoad(const CString& sArgs, CString& sErrorMsg) {
+		if (sArgs.empty()) {
+			CString sDelay = GetNV("delay");
+
+			if (sDelay.empty())
+				delay = 10;
+			else
+				delay = sDelay.ToUInt();
+		} else {
+			delay = sArgs.ToInt();
+			if (delay < 0)
+				delay = 0;
+		}
+
+		return true;
+	}
+
+	virtual void OnModCommand(const CString& sCommand) {
+		CString sCmdName = sCommand.Token(0).AsLower();
+
+		if (sCmdName == "setdelay") {
+			int i;
+			i = sCommand.Token(1).ToInt();
+
+			if (i < 0) {
+				PutModule("Negative delays don't make any sense!");
+				return;
+			}
+
+			delay = i;
+			SetNV("delay", CString(delay));
+
+			if (delay)
+				PutModule("Rejoin delay set to " + CString(delay) + " seconds");
+			else
+				PutModule("Rejoin delay disabled");
+		} else if (sCmdName == "showdelay") {
+			if (delay)
+				PutModule("Rejoin delay enabled, " + CString(delay) + " seconds");
+			else
+				PutModule("Rejoin delay disabled");
+		} else {
+			PutModule("Commands: setdelay <secs>, showdelay");
+		}
+	}
+
+	virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& pChan, const CString& sMessage) {
+		if (m_pUser->GetCurNick().CaseCmp(sKickedNick) == 0) {
+			if (!delay) {
+				PutIRC("JOIN " + pChan.GetName() + " " + pChan.GetKey());
+				pChan.Enable();
+				return;
+			}
+			AddTimer(new CRejoinJob(this, delay, 1, "Rejoin " + pChan.GetName(),
+						"Rejoin channel after a delay"));
+		}
+	}
+};
+
+MODULEDEFS(CRejoinMod, "Autorejoin on kick")