diff --git a/NEWS b/NEWS
index 6a0ae7c4a..743c3b556 100644
--- a/NEWS
+++ b/NEWS
@@ -2089,7 +2089,7 @@ strongswan-4.2.0
   refactored to support modular credential providers, proper
   CERTREQ/CERT payload exchanges and extensible authorization rules.
 
-- The framework of strongSwan Manager has envolved to the web application
+- The framework of strongSwan Manager has evolved to the web application
   framework libfast (FastCGI Application Server w/ Templates) and is usable
   by other applications.
 
diff --git a/conf/strongswan.conf.5.tail.in b/conf/strongswan.conf.5.tail.in
index f428fc323..a93fe020a 100644
--- a/conf/strongswan.conf.5.tail.in
+++ b/conf/strongswan.conf.5.tail.in
@@ -93,7 +93,7 @@ Absolutely silent
 Very basic auditing logs, (e.g. SA up/SA down)
 .TP
 .B 1
-Generic control flow with errors, a good default to see whats going on
+Generic control flow with errors, a good default to see what's going on
 .TP
 .B 2
 More detailed debugging control flow
diff --git a/src/charon/charon.c b/src/charon/charon.c
index 30f6ce2f6..180486746 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -233,7 +233,7 @@ static bool check_pidfile()
 		}
 		/* Only fchown() the pidfile if we have CAP_CHOWN. Otherwise,
 		 * directory permissions should allow pidfile to be accessed
-		 * by the UID/GID under which the charon deamon will run. */
+		 * by the UID/GID under which the charon daemon will run. */
 		if (lib->caps->check(lib->caps, CAP_CHOWN))
 		{
 			ignore_result(fchown(fd,
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_forward.h b/src/libcharon/plugins/eap_radius/eap_radius_forward.h
index 2c1dbf7a8..fc50d0d1a 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius_forward.h
+++ b/src/libcharon/plugins/eap_radius/eap_radius_forward.h
@@ -58,7 +58,7 @@ void eap_radius_forward_from_ike(radius_message_t *request);
 /**
  * Forward RADIUS attributes from a RADIUS response to IKE notifies.
  *
- * @param response		RADIUS respose to read notifies from
+ * @param response		RADIUS response to read notifies from
  */
 void eap_radius_forward_to_ike(radius_message_t *response);
 
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_plugin.h b/src/libcharon/plugins/eap_radius/eap_radius_plugin.h
index 5664efca7..86c23992f 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius_plugin.h
+++ b/src/libcharon/plugins/eap_radius/eap_radius_plugin.h
@@ -34,7 +34,7 @@ typedef struct eap_radius_plugin_t eap_radius_plugin_t;
 /**
  * EAP RADIUS proxy plugin.
  *
- * This plugin provides not a single EAP method, but a proxy to forwared
+ * This plugin provides not a single EAP method, but a proxy to forward
  * EAP packets to a RADIUS server. It only provides server implementations.
  */
 struct eap_radius_plugin_t {
diff --git a/src/libcharon/plugins/ha/ha_message.c b/src/libcharon/plugins/ha/ha_message.c
index efa2ee44c..7891b1654 100644
--- a/src/libcharon/plugins/ha/ha_message.c
+++ b/src/libcharon/plugins/ha/ha_message.c
@@ -320,7 +320,7 @@ METHOD(ha_message_t, add_attribute, void,
  * Attribute enumerator implementation
  */
 typedef struct {
-	/** implementes enumerator_t */
+	/** implements enumerator_t */
 	enumerator_t public;
 	/** position in message */
 	chunk_t buf;
diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
index 058fc44c1..7056e6ccc 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
@@ -32,7 +32,7 @@
 /**
  * General purpose netlink buffer.
  *
- * Some platforms require an enforced aligment to four bytes (e.g. ARM).
+ * Some platforms require an enforced alignment to four bytes (e.g. ARM).
  */
 typedef union {
 	struct nlmsghdr hdr;
diff --git a/src/libcharon/plugins/vici/vici_attribute.c b/src/libcharon/plugins/vici/vici_attribute.c
index ab765fa14..4d174253d 100644
--- a/src/libcharon/plugins/vici/vici_attribute.c
+++ b/src/libcharon/plugins/vici/vici_attribute.c
@@ -249,7 +249,7 @@ static bool have_vips_from_pool(mem_pool_t *pool, linked_list_t *vips)
 	{
 		end = chunk_clone(start);
 
-		/* mem_pool is currenty limited to 2^31 addresses, so 32-bit
+		/* mem_pool is currently limited to 2^31 addresses, so 32-bit
 		 * calculations should be sufficient. */
 		size = untoh32(start.ptr + start.len - sizeof(size));
 		htoun32(end.ptr + end.len - sizeof(size), size + pool->get_size(pool));
diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
index c85161550..f4e9e33ee 100644
--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
@@ -112,7 +112,7 @@ struct private_vici_config_t {
 	rwlock_t *lock;
 
 	/**
-	 * Condvar used to snyc running actions
+	 * Condvar used to sync running actions
 	 */
 	rwlock_condvar_t *condvar;
 
diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.h b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 14e271f17..288b87178 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
@@ -63,7 +63,7 @@ struct ike_mobike_t {
 	void (*dpd)(ike_mobike_t *this);
 
 	/**
-	 * Transmision hook, called by task manager.
+	 * Transmission hook, called by task manager.
 	 *
 	 * The task manager calls this hook whenever it transmits a packet. It
 	 * allows the mobike task to send the packet on multiple paths to do path
diff --git a/src/libfast/fast_dispatcher.h b/src/libfast/fast_dispatcher.h
index 7af7e0dd4..ffa49d9db 100644
--- a/src/libfast/fast_dispatcher.h
+++ b/src/libfast/fast_dispatcher.h
@@ -24,7 +24,7 @@
  *
  * The application has a global context and a session context. The global
  * context is accessed from all sessions simultaneously and therefore
- * needs to be threadsave. Often a database wrapper is the global context.
+ * needs to be threadsafe. Often a database wrapper is the global context.
  * The session context is instantiated per session. Sessions are managed
  * automatically through session cookies. The session context is kept alive
  * until the session times out. It must implement the context_t interface and
diff --git a/src/libfast/fast_request.c b/src/libfast/fast_request.c
index 0bdd16ad8..0543215cb 100644
--- a/src/libfast/fast_request.c
+++ b/src/libfast/fast_request.c
@@ -75,7 +75,7 @@ struct private_fast_request_t {
 };
 
 /**
- * ClearSilver cgiwrap is not threadsave, so we use a private
+ * ClearSilver cgiwrap is not threadsafe, so we use a private
  * context for each thread.
  */
 static thread_value_t *thread_this;
diff --git a/src/libimcv/imv/imv_policy_manager.c b/src/libimcv/imv/imv_policy_manager.c
index 1988873e9..a0e8595ed 100644
--- a/src/libimcv/imv/imv_policy_manager.c
+++ b/src/libimcv/imv/imv_policy_manager.c
@@ -113,7 +113,7 @@ static bool iterate_enforcements(database_t *db, int device_id, int session_id,
 			if (latest_success)
 			{
 				/*skipping enforcement */
-				printf("skipping enforcment %d\n", id);
+				printf("skipping enforcement %d\n", id);
 				continue;
 			}
 
diff --git a/src/libimcv/ita/ita_attr_settings.c b/src/libimcv/ita/ita_attr_settings.c
index b0907789e..8c364d26c 100644
--- a/src/libimcv/ita/ita_attr_settings.c
+++ b/src/libimcv/ita/ita_attr_settings.c
@@ -29,7 +29,7 @@ typedef struct private_ita_attr_settings_t private_ita_attr_settings_t;
 typedef struct entry_t entry_t;
 
 /**
- * Contains a settins name/value pair
+ * Contains a settings name/value pair
  */
 struct entry_t {
 	char *name;
diff --git a/src/libstrongswan/asn1/asn1.h b/src/libstrongswan/asn1/asn1.h
index 3c7389e5c..767dfaeee 100644
--- a/src/libstrongswan/asn1/asn1.h
+++ b/src/libstrongswan/asn1/asn1.h
@@ -100,7 +100,7 @@ extern const chunk_t ASN1_INTEGER_2;
 chunk_t asn1_algorithmIdentifier(int oid);
 
 /**
- * Build an algorithmIdentifier from a known OID and the given prameters.
+ * Build an algorithmIdentifier from a known OID and the given parameters.
  *
  * @param oid		known OID index
  * @param params	parameters to encode in the algorithmIdentifier (adopted)
diff --git a/src/libstrongswan/collections/enumerator.c b/src/libstrongswan/collections/enumerator.c
index 52c9e1cd5..21aa9f66b 100644
--- a/src/libstrongswan/collections/enumerator.c
+++ b/src/libstrongswan/collections/enumerator.c
@@ -291,7 +291,7 @@ typedef struct {
 	char *string;
 	/** current position */
 	char *pos;
-	/** separater chars */
+	/** separator chars */
 	const char *sep;
 	/** trim chars */
 	const char *trim;
diff --git a/src/libstrongswan/networking/streams/stream_service_unix.c b/src/libstrongswan/networking/streams/stream_service_unix.c
index 92640fc91..a9b71d6fd 100644
--- a/src/libstrongswan/networking/streams/stream_service_unix.c
+++ b/src/libstrongswan/networking/streams/stream_service_unix.c
@@ -41,7 +41,7 @@ stream_service_t *stream_service_create_unix(char *uri, int backlog)
 	{	/* required to chown(2) service socket */
 		DBG1(DBG_NET, "cannot change ownership of socket '%s' without "
 			 "CAP_CHOWN capability. socket directory should be accessible to "
-			 "UID/GID under which the deamon will run", uri);
+			 "UID/GID under which the daemon will run", uri);
 	}
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd == -1)
diff --git a/src/libstrongswan/plugins/blowfish/COPYRIGHT b/src/libstrongswan/plugins/blowfish/COPYRIGHT
index aea956a21..af1ead4b7 100644
--- a/src/libstrongswan/plugins/blowfish/COPYRIGHT
+++ b/src/libstrongswan/plugins/blowfish/COPYRIGHT
@@ -35,7 +35,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-The license and distribution terms for any publically available version or
+The license and distribution terms for any publicly available version or
 derivative of this code cannot be changed.  i.e. this code cannot simply be
 copied and put under another distribution license
 [including the GNU Public License.]
diff --git a/src/libstrongswan/plugins/blowfish/bf_enc.c b/src/libstrongswan/plugins/blowfish/bf_enc.c
index f9591c1a4..7c32e3fbb 100644
--- a/src/libstrongswan/plugins/blowfish/bf_enc.c
+++ b/src/libstrongswan/plugins/blowfish/bf_enc.c
@@ -50,7 +50,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/blowfish/bf_locl.h b/src/libstrongswan/plugins/blowfish/bf_locl.h
index e5f49280b..ad8deed80 100644
--- a/src/libstrongswan/plugins/blowfish/bf_locl.h
+++ b/src/libstrongswan/plugins/blowfish/bf_locl.h
@@ -50,7 +50,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/blowfish/bf_pi.h b/src/libstrongswan/plugins/blowfish/bf_pi.h
index 86c2ef366..650783192 100644
--- a/src/libstrongswan/plugins/blowfish/bf_pi.h
+++ b/src/libstrongswan/plugins/blowfish/bf_pi.h
@@ -50,7 +50,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/blowfish/bf_skey.c b/src/libstrongswan/plugins/blowfish/bf_skey.c
index 52a051890..f44b72383 100644
--- a/src/libstrongswan/plugins/blowfish/bf_skey.c
+++ b/src/libstrongswan/plugins/blowfish/bf_skey.c
@@ -50,7 +50,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/blowfish/blowfish.h b/src/libstrongswan/plugins/blowfish/blowfish.h
index 3c8f77a0f..771afcf15 100644
--- a/src/libstrongswan/plugins/blowfish/blowfish.h
+++ b/src/libstrongswan/plugins/blowfish/blowfish.h
@@ -50,7 +50,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/blowfish/blowfish_crypter.c b/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
index 6d8d1d709..6ef60c883 100644
--- a/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
+++ b/src/libstrongswan/plugins/blowfish/blowfish_crypter.c
@@ -49,7 +49,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/des/des_crypter.c b/src/libstrongswan/plugins/des/des_crypter.c
index 2ce9aa479..159c3872a 100644
--- a/src/libstrongswan/plugins/des/des_crypter.c
+++ b/src/libstrongswan/plugins/des/des_crypter.c
@@ -52,7 +52,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
diff --git a/src/libstrongswan/plugins/ntru/ntru_private_key.c b/src/libstrongswan/plugins/ntru/ntru_private_key.c
index 844c8baf3..642a35ca5 100644
--- a/src/libstrongswan/plugins/ntru/ntru_private_key.c
+++ b/src/libstrongswan/plugins/ntru/ntru_private_key.c
@@ -276,7 +276,7 @@ METHOD(ntru_private_key_t, decrypt, bool,
 	}
 	if (!msg_rep_good)
 	{
-		DBG1(DBG_LIB, "decryption failed due to unsufficient minimum weight");
+		DBG1(DBG_LIB, "decryption failed due to insufficient minimum weight");
 		success = FALSE;
 	}
 
diff --git a/src/libstrongswan/plugins/pkcs12/pkcs12_plugin.h b/src/libstrongswan/plugins/pkcs12/pkcs12_plugin.h
index c781687c3..c05c261eb 100644
--- a/src/libstrongswan/plugins/pkcs12/pkcs12_plugin.h
+++ b/src/libstrongswan/plugins/pkcs12/pkcs12_plugin.h
@@ -9,7 +9,7 @@
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPSE.  See the GNU General Public License
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  */
 
diff --git a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
index 3d582c7c6..57c8cf0c1 100644
--- a/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
+++ b/src/libstrongswan/plugins/pkcs7/pkcs7_plugin.h
@@ -9,7 +9,7 @@
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPSE.  See the GNU General Public License
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  */
 
diff --git a/src/libstrongswan/plugins/pkcs8/pkcs8_plugin.h b/src/libstrongswan/plugins/pkcs8/pkcs8_plugin.h
index ab0ad09bf..6ada49209 100644
--- a/src/libstrongswan/plugins/pkcs8/pkcs8_plugin.h
+++ b/src/libstrongswan/plugins/pkcs8/pkcs8_plugin.h
@@ -9,7 +9,7 @@
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPSE.  See the GNU General Public License
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
  */
 
diff --git a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
index dac990d81..56fe3001c 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
@@ -61,7 +61,7 @@ METHOD(plugin_t, destroy, void,
 plugin_t *sqlite_plugin_create()
 {
 	private_sqlite_plugin_t *this;
-	int threadsave = 0;
+	int threadsafe = 0;
 
 	INIT(this,
 		.public = {
@@ -74,10 +74,10 @@ plugin_t *sqlite_plugin_create()
 	);
 
 #if SQLITE_VERSION_NUMBER >= 3005000
-	threadsave = sqlite3_threadsafe();
+	threadsafe = sqlite3_threadsafe();
 #endif
 	DBG2(DBG_LIB, "using SQLite %s, thread safety %d",
-		 sqlite3_libversion(), threadsave);
+		 sqlite3_libversion(), threadsafe);
 
 	return &this->public.plugin;
 }
diff --git a/src/libstrongswan/utils/enum.h b/src/libstrongswan/utils/enum.h
index c668b6b2b..4312cb9a1 100644
--- a/src/libstrongswan/utils/enum.h
+++ b/src/libstrongswan/utils/enum.h
@@ -53,7 +53,7 @@ typedef struct enum_name_t enum_name_t;
  * The ENUM and the ENUM_END define a enum_name_t pointer with the name supplied
  * in "name".
  *
- * Resolving of enum names is done using a printf hook. A printf fromat
+ * Resolving of enum names is done using a printf hook. A printf format
  * character %N is replaced by the enum string. Printf needs two arguments to
  * resolve a %N, the enum_name_t* (the defined name in ENUM_BEGIN) followed
  * by the numerical enum value.
diff --git a/src/libstrongswan/utils/utils.h b/src/libstrongswan/utils/utils.h
index ec994bfc5..ea08b68c2 100644
--- a/src/libstrongswan/utils/utils.h
+++ b/src/libstrongswan/utils/utils.h
@@ -206,7 +206,7 @@ void utils_deinit();
  * Block and wait for a set of signals
  *
  * We don't replicate the functionality of siginfo_t.  If info is not NULL
- * -1 is returend and errno is set to EINVAL.
+ * -1 is returned and errno is set to EINVAL.
  *
  * @param set		set of signals to wait for
  * @param info		must be NULL
diff --git a/src/libstrongswan/utils/utils/memory.c b/src/libstrongswan/utils/utils/memory.c
index f9322449b..82c30d88e 100644
--- a/src/libstrongswan/utils/utils/memory.c
+++ b/src/libstrongswan/utils/utils/memory.c
@@ -29,7 +29,7 @@ void memxor(uint8_t dst[], const uint8_t src[], size_t n)
 	{
 		dst[i] ^= src[i];
 	}
-	/* try to use words if src shares an aligment with dst */
+	/* try to use words if src shares an alignment with dst */
 	switch (((uintptr_t)&src[i] % sizeof(long)))
 	{
 		case 0:
diff --git a/testing/tests/ipv6/rw-psk-ikev2/description.txt b/testing/tests/ipv6/rw-psk-ikev2/description.txt
index 0bd1474a0..fd7369d8f 100644
--- a/testing/tests/ipv6/rw-psk-ikev2/description.txt
+++ b/testing/tests/ipv6/rw-psk-ikev2/description.txt
@@ -1,4 +1,4 @@
-TThe roadwarriors <b>carol</b> and <b>dave</b> set up an IPv6 tunnel connection each
+The roadwarriors <b>carol</b> and <b>dave</b> set up an IPv6 tunnel connection each
 to gateway <b>moon</b>. The authentication is based on distinct <b>pre-shared keys</b>
 and IPv6 addresses. Upon the successful establishment of the IPsec tunnels,
 automatically inserted ip6tables-based firewall rules let pass the tunneled traffic.