diff --git a/doc/imudp.html b/doc/imudp.html
index 6c94953..a8dbca3 100644
--- a/doc/imudp.html
+++ b/doc/imudp.html
@@ -72,7 +72,7 @@ the default of "imudp" is used and the port is appended to that default. So,
 for example, a listner port of 514 in that case will lead to an inputname
 of "imudp514". The ability to append a port is most useful when multiple ports
 are defined for a single input and each of the inputnames shall be unique.
-Note that there currently is no differentiation between IPv4/v6 listners on
+Note that there currently is no differentiation between IPv4/v6 listeners on
 the same port.
 </li>
 </ul>
@@ -91,7 +91,7 @@ user account.
 input(type="imudp" port="514")
 </textarea>
 
-<p>In the next example, we set up three listners at ports 10514, 10515 and 10516
+<p>In the next example, we set up three listeners at ports 10514, 10515 and 10516
 and assign a listner name of "udp" to it, followed by the port number:
 </p>
 <textarea rows="4" cols="60">module(load="imudp")
diff --git a/doc/multi_ruleset.html b/doc/multi_ruleset.html
index 37c5406..83c495c 100644
--- a/doc/multi_ruleset.html
+++ b/doc/multi_ruleset.html
@@ -191,7 +191,7 @@ ruleset(name="test1"){
 }
 
 
-# and now define listners bound to the relevant ruleset
+# and now define listeners bound to the relevant ruleset
 input(type="imptcp" port="10514" ruleset="remote10514")
 input(type="imptcp" port="10515" ruleset="remote10515")
 input(type="imptcp" port="10516" ruleset="remote10516")
diff --git a/doc/multi_ruleset_legacy_format.html b/doc/multi_ruleset_legacy_format.html
index 5a9e7a4..273a4a0 100644
--- a/doc/multi_ruleset_legacy_format.html
+++ b/doc/multi_ruleset_legacy_format.html
@@ -168,7 +168,7 @@ mail.*	/var/log/mail10516
 # being written to the remote10516 file - as usual...
 *.*     /var/log/remote10516
 
-# and now define listners bound to the relevant ruleset
+# and now define listeners bound to the relevant ruleset
 $InputTCPServerBindRuleset remote10514
 $InputTCPServerRun 10514
 
diff --git a/doc/rsconf1_rulesetcreatemainqueue.html b/doc/rsconf1_rulesetcreatemainqueue.html
index 5c1e0de..d09f95c 100644
--- a/doc/rsconf1_rulesetcreatemainqueue.html
+++ b/doc/rsconf1_rulesetcreatemainqueue.html
@@ -58,7 +58,7 @@ mail.*	/var/log/mail10516
 # being written to the remote10516 file - as usual...
 *.*     /var/log/remote10516
 
-# and now define listners bound to the relevant ruleset
+# and now define listeners bound to the relevant ruleset
 $InputTCPServerBindRuleset remote10514
 $InputTCPServerRun 10514
 
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 349acea..89846da 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -596,7 +596,7 @@ CODESTARTactivateCnf
 	for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
 		addListner(inst);
 	}
-	/* if we could not set up any listners, there is no point in running... */
+	/* if we could not set up any listeners, there is no point in running... */
 	if(iFilPtr == 0) {
 		errmsg.LogError(0, NO_ERRCODE, "imfile: no file monitors could be started, "
 				"input not activated.\n");
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index fc22d45..bf2c1fc 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -140,7 +140,7 @@ static struct cnfparamdescr modpdescr[] = {
 	{ "notifyonconnectionclose", eCmdHdlrBinary, 0 },
 	{ "addtlframedelimiter", eCmdHdlrPositiveInt, 0 },
 	{ "maxsessions", eCmdHdlrPositiveInt, 0 },
-	{ "maxlistners", eCmdHdlrPositiveInt, 0 },
+	{ "maxlisteners", eCmdHdlrPositiveInt, 0 },
 	{ "streamdriver.mode", eCmdHdlrPositiveInt, 0 },
 	{ "streamdriver.authmode", eCmdHdlrString, 0 },
 	{ "permittedpeer", eCmdHdlrArray, 0 },
@@ -453,7 +453,7 @@ CODESTARTsetModCnf
 			loadModConf->iAddtlFrameDelim = (int) pvals[i].val.d.n;
 		} else if(!strcmp(modpblk.descr[i].name, "maxsessions")) {
 			loadModConf->iTCPSessMax = (int) pvals[i].val.d.n;
-		} else if(!strcmp(modpblk.descr[i].name, "maxlistners")) {
+		} else if(!strcmp(modpblk.descr[i].name, "maxlisteners")) {
 			loadModConf->iTCPLstnMax = (int) pvals[i].val.d.n;
 		} else if(!strcmp(modpblk.descr[i].name, "keepalive")) {
 			loadModConf->bKeepAlive = (int) pvals[i].val.d.n;
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 7bf1473..dacca69 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -872,7 +872,7 @@ CODESTARTactivateCnfPrePrivDrop
 	for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
 		addListner(inst);
 	}
-	/* if we could not set up any listners, there is no point in running... */
+	/* if we could not set up any listeners, there is no point in running... */
 	if(lcnfRoot == NULL) {
 		errmsg.LogError(0, NO_ERRCODE, "imudp: no listeners could be started, "
 				"input not activated.\n");
diff --git a/runtime/strmsrv.h b/runtime/strmsrv.h
index 9ef28e4..f3d56d1 100644
--- a/runtime/strmsrv.h
+++ b/runtime/strmsrv.h
@@ -43,7 +43,7 @@ struct strmsrv_s {
 	uchar *pszInputName;	/**< value to be used as input name */
 	permittedPeers_t *pPermPeers;/**< driver's permitted peers */
 	int iLstnMax;		/**< max nbr of listeners currently supported */
-	netstrm_t **ppLstn;	/**< our netstream listners */
+	netstrm_t **ppLstn;	/**< our netstream listeners */
 	strmLstnPortList_t **ppLstnPort; /**< pointer to relevant listen port description */
 	int iSessMax;		/**< max number of sessions supported */
 	strmLstnPortList_t *pLstnPorts;	/**< head pointer for listen ports */
diff --git a/tcpsrv.h b/tcpsrv.h
index 93e472c..c9d491d 100644
--- a/tcpsrv.h
+++ b/tcpsrv.h
@@ -63,9 +63,9 @@ struct tcpsrv_s {
 	sbool bUsingEPoll;	/**< are we in epoll mode (means we do not need to keep track of sessions!) */
 	sbool bUseFlowControl;	/**< use flow control (make light delayable) */
 	int iLstnCurr;		/**< max nbr of listeners currently supported */
-	netstrm_t **ppLstn;	/**< our netstream listners */
+	netstrm_t **ppLstn;	/**< our netstream listeners */
 	tcpLstnPortList_t **ppLstnPort; /**< pointer to relevant listen port description */
-	int iLstnMax;		/**< max number of listners supported */
+	int iLstnMax;		/**< max number of listeners supported */
 	int iSessMax;		/**< max number of sessions supported */
 	tcpLstnPortList_t *pLstnPorts;	/**< head pointer for listen ports */