diff --git a/znc.cpp b/znc.cpp
index e620452f..2414856a 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -525,6 +525,8 @@ bool CZNC::WriteConfig() {
 		return false;
 	}
 
+	m_LockFile.Write(MakeConfigHeader() + "\n");
+
 	GLOBALMODULECALL(OnWriteConfig(m_LockFile), NULL, NULL, return false);
 
 	m_LockFile.Write("AnonIPLimit  = " + CString(m_uiAnonIPLimit) + "\n");
@@ -633,9 +635,19 @@ bool CZNC::WriteConfig() {
 	return true;
 }
 
+CString CZNC::MakeConfigHeader() {
+	return
+		"// WARNING\n"
+		"//\n"
+		"// Do NOT edit this file while ZNC is running!\n"
+		"// Use webadmin or *admin instead.\n";
+}
+
 bool CZNC::WriteNewConfig(const CString& sConfigFile) {
 	CString sAnswer, sUser;
 	VCString vsLines;
+	
+	vsLines.push_back(MakeConfigHeader());
 
 	m_sConfigFile = ExpandConfigPath(sConfigFile);
 	CUtils::PrintMessage("Building new config");
diff --git a/znc.h b/znc.h
index b59e9a46..ab47ca41 100644
--- a/znc.h
+++ b/znc.h
@@ -146,6 +146,7 @@ private:
 	bool DoRehash(CString& sError);
 	// Returns true if something was done
 	bool HandleUserDeletion();
+	CString MakeConfigHeader();
 
 protected:
 	time_t                 m_TimeStarted;