diff --git a/modules/admin.cpp b/modules/admin.cpp
index 37b46c17..aaaf6a37 100644
--- a/modules/admin.cpp
+++ b/modules/admin.cpp
@@ -857,4 +857,8 @@ public:
 	virtual ~CAdminMod() {}
 };
 
+template<> void TModInfo<CAdminMod>(CModInfo& Info) {
+	Info.SetWikiPage("admin");
+}
+
 MODULEDEFS(CAdminMod, "Dynamic configuration of users/settings through IRC")
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index fa21e1ae..64bc9b42 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -163,4 +163,8 @@ private:
 	CString m_sLogFile;
 };
 
+template<> void TModInfo<CAdminLogMod>(CModInfo& Info) {
+	Info.SetWikiPage("adminlog");
+}
+
 GLOBALMODULEDEFS(CAdminLogMod, "Log ZNC events to file and/or syslog.")
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
index bd54863b..3dfd136a 100644
--- a/modules/autoattach.cpp
+++ b/modules/autoattach.cpp
@@ -246,4 +246,8 @@ private:
 	VAttachMatch m_vMatches;
 };
 
+template<> void TModInfo<CChanAttach>(CModInfo& Info) {
+	Info.SetWikiPage("autoattach");
+}
+
 MODULEDEFS(CChanAttach, "Reattaches you to channels on activity.")
diff --git a/modules/autocycle.cpp b/modules/autocycle.cpp
index db7a19bd..969cf81a 100644
--- a/modules/autocycle.cpp
+++ b/modules/autocycle.cpp
@@ -224,4 +224,8 @@ private:
 	vector<CString> m_vsNegChans;
 };
 
+template<> void TModInfo<CAutoCycleMod>(CModInfo& Info) {
+	Info.SetWikiPage("autocycle");
+}
+
 MODULEDEFS(CAutoCycleMod, "Rejoins channels to gain Op if you're the only user left")
diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index b48cbb52..ebbf34d2 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -463,4 +463,8 @@ void CAutoOpTimer::RunJob() {
 	m_pParent->ProcessQueue();
 }
 
+template<> void TModInfo<CAutoOpMod>(CModInfo& Info) {
+	Info.SetWikiPage("autoop");
+}
+
 MODULEDEFS(CAutoOpMod, "Auto op the good guys")
diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp
index d76f298e..72145264 100644
--- a/modules/autoreply.cpp
+++ b/modules/autoreply.cpp
@@ -88,5 +88,9 @@ private:
 	TCacheMap<CString> m_Messaged;
 };
 
+template<> void TModInfo<CAutoReplyMod>(CModInfo& Info) {
+	Info.SetWikiPage("autoreply");
+}
+
 MODULEDEFS(CAutoReplyMod, "Reply to queries when you are away")
 
diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index 82a22d1b..298f90ed 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -186,4 +186,8 @@ void CAwayNickTimer::RunJob() {
 	}
 }
 
+template<> void TModInfo<CAwayNickMod>(CModInfo& Info) {
+	Info.SetWikiPage("awaynick");
+}
+
 MODULEDEFS(CAwayNickMod, "Change your nick while you are away")
diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp
index f5a6d881..e43d28e4 100644
--- a/modules/blockuser.cpp
+++ b/modules/blockuser.cpp
@@ -168,4 +168,8 @@ private:
 	}
 };
 
+template<> void TModInfo<CBlockUser>(CModInfo& Info) {
+	Info.SetWikiPage("blockuser");
+}
+
 GLOBALMODULEDEFS(CBlockUser, "Block certain users from logging in")
diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp
index 0f1b6e8a..02655f9f 100644
--- a/modules/buffextras.cpp
+++ b/modules/buffextras.cpp
@@ -66,5 +66,9 @@ public:
 	}
 };
 
+template<> void TModInfo<CBuffExtras>(CModInfo& Info) {
+	Info.SetWikiPage("buffextras");
+}
+
 MODULEDEFS(CBuffExtras, "Add joins, parts etc. to the playback buffer")
 
diff --git a/modules/cert.cpp b/modules/cert.cpp
index 656a61ce..07fb5a97 100644
--- a/modules/cert.cpp
+++ b/modules/cert.cpp
@@ -85,4 +85,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CCertMod>(CModInfo& Info) {
+	Info.SetWikiPage("cert");
+}
+
 MODULEDEFS(CCertMod, "Use a ssl certificate to connect to a server")
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index ec42cd66..96d870e3 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -276,4 +276,8 @@ private:
 	MSCString                           m_PubKeys;
 };
 
+template<> void TModInfo<CSSLClientCertMod>(CModInfo& Info) {
+	Info.SetWikiPage("certauth");
+}
+
 GLOBALMODULEDEFS(CSSLClientCertMod, "Allow users to authenticate via SSL client certificates")
diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index 7223aa0c..1da6614a 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -72,4 +72,8 @@ private:
 	bool m_bWriteConf;
 };
 
+template<> void TModInfo<CChanSaverMod>(CModInfo& Info) {
+	Info.SetWikiPage("chansaver");
+}
+
 MODULEDEFS(CChanSaverMod, "Keep config up-to-date when user joins/parts")
diff --git a/modules/clientnotify.cpp b/modules/clientnotify.cpp
index ff3fea15..59b1c085 100644
--- a/modules/clientnotify.cpp
+++ b/modules/clientnotify.cpp
@@ -102,5 +102,9 @@ public:
 	}
 };
 
+template<> void TModInfo<CClientNotifyMod>(CModInfo& Info) {
+	Info.SetWikiPage("clientnotify");
+}
+
 MODULEDEFS(CClientNotifyMod, "Notifies you when another IRC client logs into or out of your account. Configurable.")
 
diff --git a/modules/crypt.cpp b/modules/crypt.cpp
index a5ef87f3..e492d521 100644
--- a/modules/crypt.cpp
+++ b/modules/crypt.cpp
@@ -151,4 +151,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CCryptMod>(CModInfo& Info) {
+	Info.SetWikiPage("crypt");
+}
+
 MODULEDEFS(CCryptMod, "Encryption for channel/private messages")
diff --git a/modules/disconkick.cpp b/modules/disconkick.cpp
index 619d610c..60938122 100644
--- a/modules/disconkick.cpp
+++ b/modules/disconkick.cpp
@@ -29,4 +29,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CKickClientOnIRCDisconnect>(CModInfo& Info) {
+	Info.SetWikiPage("disconkick");
+}
+
 MODULEDEFS(CKickClientOnIRCDisconnect, "Kicks the client from all channels when the connection to the IRC server is lost")
diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp
index 9e2e9a6a..a1595b0b 100644
--- a/modules/fail2ban.cpp
+++ b/modules/fail2ban.cpp
@@ -95,4 +95,8 @@ private:
 	unsigned int                     m_uiAllowedFailed;
 };
 
+template<> void TModInfo<CFailToBanMod>(CModInfo& Info) {
+	Info.SetWikiPage("fail2ban");
+}
+
 GLOBALMODULEDEFS(CFailToBanMod, "Block IPs for some time after a failed login")
diff --git a/modules/fixfreenode.cpp b/modules/fixfreenode.cpp
index a14b52ac..f737c495 100644
--- a/modules/fixfreenode.cpp
+++ b/modules/fixfreenode.cpp
@@ -22,4 +22,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CPreventIdMsgMod>(CModInfo& Info) {
+	Info.SetWikiPage("fixfreenode");
+}
+
 MODULEDEFS(CPreventIdMsgMod, "Prevent client from sending IDENTIFY-MSG to server")
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index f7111b66..05a61be9 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -162,4 +162,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CIdentFileModule>(CModInfo& Info) {
+	Info.SetWikiPage("identfile");
+}
+
 GLOBALMODULEDEFS(CIdentFileModule, "Write the ident of a user to a file when they are trying to connect")
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index 3a8a18ac..601607b3 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -192,4 +192,8 @@ void CKeepNickTimer::RunJob() {
 	m_pMod->KeepNick();
 }
 
+template<> void TModInfo<CKeepNickMod>(CModInfo& Info) {
+	Info.SetWikiPage("keepnick");
+}
+
 MODULEDEFS(CKeepNickMod, "Keep trying for your primary nick")
diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp
index 3a4f3cf0..68b05c23 100644
--- a/modules/kickrejoin.cpp
+++ b/modules/kickrejoin.cpp
@@ -108,4 +108,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CRejoinMod>(CModInfo& Info) {
+	Info.SetWikiPage("kickrejoin");
+}
+
 MODULEDEFS(CRejoinMod, "Autorejoin on kick")
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index 500f93a3..49a79ab2 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -148,4 +148,8 @@ public:
 
 };
 
+template<> void TModInfo<CLastSeenMod>(CModInfo& Info) {
+	Info.SetWikiPage("lastseen");
+}
+
 GLOBALMODULEDEFS(CLastSeenMod, "Collects data about when a user last logged in")
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index 1dc46d77..1c3aa2ed 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -316,4 +316,8 @@ CPerlSocket::~CPerlSocket() {
 	}
 }
 
+template<> void TModInfo<CModPerl>(CModInfo& Info) {
+	Info.SetWikiPage("modperl");
+}
+
 GLOBALMODULEDEFS(CModPerl, "Loads perl scripts as ZNC modules")
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index 2f597c89..3b12de54 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -478,4 +478,8 @@ PyObject* CPySocket::WriteBytes(PyObject* data) {
 	}
 }
 
+template<> void TModInfo<CModPython>(CModInfo& Info) {
+	Info.SetWikiPage("modpython");
+}
+
 GLOBALMODULEDEFS(CModPython, "Loads python scripts as ZNC modules")
diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp
index 918ad871..0ba8a82f 100644
--- a/modules/modtcl.cpp
+++ b/modules/modtcl.cpp
@@ -494,4 +494,8 @@ void CModTclStartTimer::RunJob() {
 		p->Start();
 }
 
+template<> void TModInfo<CModTcl>(CModInfo& Info) {
+	Info.SetWikiPage("modtcl");
+}
+
 MODULEDEFS(CModTcl, "Loads Tcl scripts as ZNC modules")
diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index 90d615e7..05da5b35 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -76,4 +76,8 @@ private:
 	CString m_sPass;
 };
 
+template<> void TModInfo<CNickServ>(CModInfo& Info) {
+	Info.SetWikiPage("nickserv");
+}
+
 MODULEDEFS(CNickServ, "Auths you with NickServ")
diff --git a/modules/notes.cpp b/modules/notes.cpp
index 553157e1..37dd7983 100644
--- a/modules/notes.cpp
+++ b/modules/notes.cpp
@@ -212,4 +212,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CNotesMod>(CModInfo& Info) {
+	Info.SetWikiPage("notes");
+}
+
 MODULEDEFS(CNotesMod, "Keep and replay notes")
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index 2624b819..f7e6f4e4 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -715,4 +715,8 @@ private:
 	set<CString>            m_ssDefaultChans;
 };
 
+template<> void TModInfo<CPartylineMod>(CModInfo& Info) {
+	Info.SetWikiPage("partyline");
+}
+
 GLOBALMODULEDEFS(CPartylineMod, "Internal channels and queries for users connected to znc")
diff --git a/modules/perform.cpp b/modules/perform.cpp
index 6e62c733..e1ce0bf2 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -166,4 +166,8 @@ private:
 	VCString m_vPerform;
 };
 
+template<> void TModInfo<CPerform>(CModInfo& Info) {
+	Info.SetWikiPage("perform");
+}
+
 MODULEDEFS(CPerform, "Keeps a list of commands to be executed when ZNC connects to IRC.")
diff --git a/modules/q.cpp b/modules/q.cpp
index 2ca11cf5..157eb36f 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -483,4 +483,8 @@ private:
 	}
 };
 
+template<> void TModInfo<CQModule>(CModInfo& Info) {
+	Info.SetWikiPage("Q");
+}
+
 MODULEDEFS(CQModule, "Auths you with QuakeNet's Q bot.")
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 143dc70e..237c99ad 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -28,5 +28,9 @@ public:
 	}
 };
 
+template<> void TModInfo<CRawMod>(CModInfo& Info) {
+	Info.SetWikiPage("raw");
+}
+
 MODULEDEFS(CRawMod, "View all of the raw traffic")
 
diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp
index 6ac8feac..925e8893 100644
--- a/modules/route_replies.cpp
+++ b/modules/route_replies.cpp
@@ -422,4 +422,8 @@ void CRouteTimeout::RunJob()
 	pMod->Timeout();
 }
 
+template<> void TModInfo<CRouteRepliesMod>(CModInfo& Info) {
+	Info.SetWikiPage("route_replies");
+}
+
 MODULEDEFS(CRouteRepliesMod, "Send replies (e.g. to /who) to the right client only")
diff --git a/modules/sample.cpp b/modules/sample.cpp
index 5c48f6b3..68d5bc4f 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -230,5 +230,9 @@ public:
 	}
 };
 
+template<> void TModInfo<CSampleMod>(CModInfo& Info) {
+	Info.SetWikiPage("sample");
+}
+
 MODULEDEFS(CSampleMod, "To be used as a sample for writing modules")
 
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index 9490336a..5083b18d 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -335,5 +335,9 @@ void CSaveBuffJob::RunJob()
 	p->SaveBufferToDisk();
 }
 
+template<> void TModInfo<CSaveBuff>(CModInfo& Info) {
+	Info.SetWikiPage("savebuff");
+}
+
 MODULEDEFS(CSaveBuff, "Stores channel buffers to disk, encrypted")
 
diff --git a/modules/schat.cpp b/modules/schat.cpp
index 6d50f46d..bdfa78c9 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -463,5 +463,10 @@ void CRemMarkerJob::RunJob()
 
 	// store buffer
 }
+
+template<> void TModInfo<CSChat>(CModInfo& Info) {
+	Info.SetWikiPage("schat");
+}
+
 MODULEDEFS(CSChat, "Secure cross platform (:P) chat system")
 
diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
index 88df0873..bf0ded7f 100644
--- a/modules/simple_away.cpp
+++ b/modules/simple_away.cpp
@@ -216,5 +216,8 @@ void CSimpleAwayJob::RunJob() {
 	((CSimpleAway*)m_pModule)->SetAway(false);
 }
 
+template<> void TModInfo<CSimpleAway>(CModInfo& Info) {
+	Info.SetWikiPage("simple_away");
+}
 
 MODULEDEFS(CSimpleAway, "Auto away when last client disconnects")
diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp
index f57c9edf..5c7a9f0c 100644
--- a/modules/stickychan.cpp
+++ b/modules/stickychan.cpp
@@ -187,4 +187,8 @@ bool CStickyChan::OnLoad(const CString& sArgs, CString& sMessage)
 	return(true);
 }
 
+template<> void TModInfo<CStickyChan>(CModInfo& Info) {
+	Info.SetWikiPage("stickychan");
+}
+
 MODULEDEFS(CStickyChan, "configless sticky chans, keeps you there very stickily even")
diff --git a/modules/watch.cpp b/modules/watch.cpp
index 4f778b11..62573321 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -550,4 +550,8 @@ private:
 	CBuffer            m_Buffer;
 };
 
+template<> void TModInfo<CWatcherMod>(CModInfo& Info) {
+	Info.SetWikiPage("watch");
+}
+
 MODULEDEFS(CWatcherMod, "Copy activity from a specific user into a separate window")
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 543a2221..40c22316 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1126,4 +1126,8 @@ public:
 	}
 };
 
+template<> void TModInfo<CWebAdminMod>(CModInfo& Info) {
+	Info.SetWikiPage("webadmin");
+}
+
 GLOBALMODULEDEFS(CWebAdminMod, "Web based administration module")