diff --git a/modules/extra/block_motd.cpp b/modules/extra/block_motd.cpp
new file mode 100644
index 00000000..75e6f9ab
--- /dev/null
+++ b/modules/extra/block_motd.cpp
@@ -0,0 +1,33 @@
+/*
+ * 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 "Modules.h"
+
+class CBlockMotd : public CModule {
+public:
+	MODCONSTRUCTOR(CBlockMotd) {
+	}
+
+	virtual ~CBlockMotd() {
+	}
+
+	virtual EModRet OnRaw(CString &sLine) {
+		const CString sCmd = sLine.Token(1);
+
+		if (sCmd == "375" /* begin of MOTD */
+				|| sCmd == "372" /* MOTD */)
+			return HALT;
+		if (sCmd == "376" /* End of MOTD */) {
+			sLine = sLine.Token(0) + " 422 " +
+				sLine.Token(2) + " :MOTD blocked by ZNC";
+		}
+		return CONTINUE;
+	}
+};
+
+MODULEDEFS(CBlockMotd, "Block the MOTD from IRC so it's not sent to your client(s).")