diff --git a/include/znc/znc.h b/include/znc/znc.h
index 96969ed4..cf2326e3 100644
--- a/include/znc/znc.h
+++ b/include/znc/znc.h
@@ -99,6 +99,7 @@ public:
 	void SetAnonIPLimit(unsigned int i) { m_uiAnonIPLimit = i; }
 	void SetServerThrottle(unsigned int i) { m_sConnectThrottle.SetTTL(i*1000); }
 	void SetProtectWebSessions(bool b) { m_bProtectWebSessions = b; }
+	void SetHideVersion(bool b) { m_bHideVersion = b; }
 	void SetConnectDelay(unsigned int i);
 	// !Setters
 
@@ -127,6 +128,7 @@ public:
 	unsigned int GetServerThrottle() const { return m_sConnectThrottle.GetTTL() / 1000; }
 	unsigned int GetConnectDelay() const { return m_uiConnectDelay; }
 	bool GetProtectWebSessions() const { return m_bProtectWebSessions; }
+	bool GetHideVersion() const { return m_bHideVersion; }
 	CString GetSSLCiphers() const { return m_sSSLCiphers; }
 	Csock::EDisableProtocol GetDisabledSSLProtocols() const { return static_cast<Csock::EDisableProtocol>(m_uDisabledSSLProtocols); }
 	// !Getters
@@ -229,6 +231,7 @@ protected:
 	unsigned int           m_uiConnectPaused;
 	TCacheMap<CString>     m_sConnectThrottle;
 	bool                   m_bProtectWebSessions;
+	bool                   m_bHideVersion;
 };
 
 #endif // !_ZNC_H
diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
index a2a0aa4e..ef3f8eb2 100644
--- a/modules/data/webadmin/tmpl/settings.tmpl
+++ b/modules/data/webadmin/tmpl/settings.tmpl
@@ -137,6 +137,13 @@
 				</div>
 
 
+				<div class="subsection">
+					<div class="inputlabel">Hide ZNC Version:</div>
+					<div class="checkbox"><input type="checkbox" name="hideversion" id="hideversion_checkbox"<? IF HideVersion ?> checked="checked"<? ENDIF ?> />
+						<label for="hideversion_checkbox">Hide version number from non-ZNC users</label></div>
+				</div>
+
+
 				<div class="subsection twothird">
 					<div class="inputlabel">MOTD:</div>
 					<textarea name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index ea75d50c..d4cf6d75 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1684,6 +1684,7 @@ public:
 			Tmpl["ServerThrottle"] = CString(CZNC::Get().GetServerThrottle());
 			Tmpl["AnonIPLimit"] = CString(CZNC::Get().GetAnonIPLimit());
 			Tmpl["ProtectWebSessions"] = CString(CZNC::Get().GetProtectWebSessions());
+			Tmpl["HideVersion"] = CString(CZNC::Get().GetHideVersion());
 
 			const VCString& vsBindHosts = CZNC::Get().GetBindHosts();
 			for (unsigned int a = 0; a < vsBindHosts.size(); a++) {
@@ -1817,6 +1818,7 @@ public:
 		sArg = WebSock.GetParam("serverthrottle"); CZNC::Get().SetServerThrottle(sArg.ToUInt());
 		sArg = WebSock.GetParam("anoniplimit"); CZNC::Get().SetAnonIPLimit(sArg.ToUInt());
 		sArg = WebSock.GetParam("protectwebsessions"); CZNC::Get().SetProtectWebSessions(sArg.ToBool());
+		sArg = WebSock.GetParam("hideversion"); CZNC::Get().SetHideVersion(sArg.ToBool());
 
 		VCString vsArgs;
 		WebSock.GetRawParam("motd").Split("\n", vsArgs);
diff --git a/src/znc.cpp b/src/znc.cpp
index 1bf4b812..7ebde5f9 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -55,6 +55,7 @@ CZNC::CZNC() {
 	m_sConnectThrottle.SetTTL(30000);
 	m_pLockFile = NULL;
 	m_bProtectWebSessions = true;
+	m_bHideVersion = false;
 	m_uDisabledSSLProtocols = Csock::EDP_SSL;
 	m_sSSLProtocols = "";
 }
@@ -96,6 +97,9 @@ CString CZNC::GetVersion() {
 }
 
 CString CZNC::GetTag(bool bIncludeVersion, bool bHTML) {
+	if (!Get().m_bHideVersion) {
+		bIncludeVersion = true;
+	}
 	CString sAddress = bHTML ? "<a href=\"http://znc.in\">http://znc.in</a>" : "http://znc.in";
 
 	if (!bIncludeVersion) {
@@ -441,6 +445,7 @@ bool CZNC::WriteConfig() {
 	config.AddKeyValuePair("MaxBufferSize", CString(m_uiMaxBufferSize));
 	config.AddKeyValuePair("SSLCertFile", CString(m_sSSLCertFile));
 	config.AddKeyValuePair("ProtectWebSessions", CString(m_bProtectWebSessions));
+	config.AddKeyValuePair("HideVersion", CString(m_bHideVersion));
 	config.AddKeyValuePair("Version", CString(VERSION_STR));
 
 	for (size_t l = 0; l < m_vpListeners.size(); l++) {
@@ -1099,6 +1104,8 @@ bool CZNC::DoRehash(CString& sError)
 		m_uiMaxBufferSize = sVal.ToUInt();
 	if (config.FindStringEntry("protectwebsessions", sVal))
   		m_bProtectWebSessions = sVal.ToBool();
+	if (config.FindStringEntry("hideversion", sVal))
+		m_bHideVersion = sVal.ToBool();
 
 	if (config.FindStringEntry("sslprotocols", m_sSSLProtocols)) {
 		VCString vsProtocols;