diff --git a/src/libcharon/plugins/ha/ha_segments.h b/src/libcharon/plugins/ha/ha_segments.h
index eb9e5c1d5..76da38082 100644
--- a/src/libcharon/plugins/ha/ha_segments.h
+++ b/src/libcharon/plugins/ha/ha_segments.h
@@ -55,7 +55,7 @@ struct ha_segments_t {
 	 * Activate a set of IKE_SAs identified by a segment.
 	 *
 	 * @param segment	numerical segment to takeover, 0 for all
-	 * @param notify	wheter to notify other nodes about activation
+	 * @param notify	whether to notify other nodes about activation
 	 */
 	void (*activate)(ha_segments_t *this, u_int segment, bool notify);
 
@@ -63,7 +63,7 @@ struct ha_segments_t {
 	 * Deactivate a set of IKE_SAs identified by a segment.
 	 *
 	 * @param segment	numerical segment to takeover, 0 for all
-	 * @param notify	wheter to notify other nodes about deactivation
+	 * @param notify	whether to notify other nodes about deactivation
 	 */
 	void (*deactivate)(ha_segments_t *this, u_int segment, bool notify);
 
diff --git a/src/libcharon/sa/tasks/ike_cert_pre.c b/src/libcharon/sa/tasks/ike_cert_pre.c
index 1919ed0a6..b33aebe46 100644
--- a/src/libcharon/sa/tasks/ike_cert_pre.c
+++ b/src/libcharon/sa/tasks/ike_cert_pre.c
@@ -51,7 +51,7 @@ struct private_ike_cert_pre_t {
 	bool do_http_lookup;
 
 	/**
-	 * wheter this is the final authentication round
+	 * whether this is the final authentication round
 	 */
 	bool final;
 };
diff --git a/src/libfast/smtp.h b/src/libfast/smtp.h
index 910f18127..9589ea2a6 100644
--- a/src/libfast/smtp.h
+++ b/src/libfast/smtp.h
@@ -34,7 +34,7 @@ struct smtp_t {
 	 * Send an e-mail message.
 	 *
 	 * @param from		sender address
-	 * @param to		receipient address
+	 * @param to		recipient address
 	 * @param subject	mail subject
 	 * @param fmt		mail body format string
 	 * @param ...		arguments for body format string
diff --git a/src/libhydra/plugins/attr_sql/sql_attribute.c b/src/libhydra/plugins/attr_sql/sql_attribute.c
index fe7811b36..714bbcd72 100644
--- a/src/libhydra/plugins/attr_sql/sql_attribute.c
+++ b/src/libhydra/plugins/attr_sql/sql_attribute.c
@@ -38,7 +38,7 @@ struct private_sql_attribute_t {
 	database_t *db;
 
 	/**
-	 * wheter to record lease history in lease table
+	 * whether to record lease history in lease table
 	 */
 	bool history;
 };
diff --git a/src/libhydra/plugins/resolve/resolve_plugin.c b/src/libhydra/plugins/resolve/resolve_plugin.c
index d23d36127..f95827ed9 100644
--- a/src/libhydra/plugins/resolve/resolve_plugin.c
+++ b/src/libhydra/plugins/resolve/resolve_plugin.c
@@ -31,7 +31,7 @@ struct private_resolve_plugin_t {
 	resolve_plugin_t public;
 
 	/**
-	 * The registerd DNS attribute handler
+	 * The registered DNS attribute handler
 	 */
 	resolve_handler_t *handler;
 };
diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_process.c b/src/libpts/plugins/imc_attestation/imc_attestation_process.c
index 1f81c2068..b70c05370 100644
--- a/src/libpts/plugins/imc_attestation/imc_attestation_process.c
+++ b/src/libpts/plugins/imc_attestation/imc_attestation_process.c
@@ -422,7 +422,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
 							"libimcv.plugins.imc-attestation.use_quote2", TRUE);
 			if (!pts->quote_tpm(pts, use_quote2, &pcr_composite, &quote_sig))
 			{
-				DBG1(DBG_IMC, "error occured during TPM quote operation");
+				DBG1(DBG_IMC, "error occurred during TPM quote operation");
 				return FALSE;
 			}
 
diff --git a/src/libpts/pts/components/ita/ita_comp_tgrub.c b/src/libpts/pts/components/ita/ita_comp_tgrub.c
index a1b2cd066..0dfd5fd41 100644
--- a/src/libpts/pts/components/ita/ita_comp_tgrub.c
+++ b/src/libpts/pts/components/ita/ita_comp_tgrub.c
@@ -87,7 +87,7 @@ METHOD(pts_component_t, measure, status_t,
 		
 	if (!pts->read_pcr(pts, extended_pcr, &pcr_after))
 	{
-		DBG1(DBG_PTS, "error occured while reading PCR: %d", extended_pcr);
+		DBG1(DBG_PTS, "error occurred while reading PCR: %d", extended_pcr);
 		return FAILED;
 	}
 
diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c
index 6469f7cc4..65ae2b2d2 100644
--- a/src/libpts/pts/pts.c
+++ b/src/libpts/pts/pts.c
@@ -557,7 +557,7 @@ METHOD(pts_t, is_path_valid, bool,
 	}
 	else
 	{
-		DBG1(DBG_PTS, "error: %s occured while validating path: %s",
+		DBG1(DBG_PTS, "error: %s occurred while validating path: %s",
 			 		   strerror(errno), path);
 		return FALSE;
 	}
diff --git a/src/libpts/pts/pts.h b/src/libpts/pts/pts.h
index 814befffc..212acb02a 100644
--- a/src/libpts/pts/pts.h
+++ b/src/libpts/pts/pts.h
@@ -69,7 +69,7 @@ typedef struct pts_t pts_t;
 #define ASSESSMENT_SECRET_LEN	20
 
 /**
- * Lenght of the TPM_QUOTE_INFO structure, TPM Spec 1.2
+ * Length of the TPM_QUOTE_INFO structure, TPM Spec 1.2
  */
 #define TPM_QUOTE_INFO_LEN		48
 
@@ -225,7 +225,7 @@ struct pts_t {
 	 * @param error_code		Output variable for PTS error code
 	 * @return					TRUE if path is valid or file/directory
 	 *							doesn't exist or path is invalid
-	 * 						FALSE if local error occured within stat function
+	 * 						FALSE if local error occurred within stat function
 	 */
 	bool (*is_path_valid)(pts_t *this, char *path, pts_error_code_t *error_code);
 
@@ -285,7 +285,7 @@ struct pts_t {
 	 * Quote over PCR's
 	 * Expects owner and SRK secret to be WELL_KNOWN_SECRET and no password set for AIK
 	 *
-	 * @param use_quote2		Version of the Quote funtion to be used
+	 * @param use_quote2		Version of the Quote function to be used
 	 * @param pcr_comp			Chunk to save PCR composite structure
 	 * @param quote_sig			Chunk to save quote operation output
 	 *							without external data (anti-replay protection)
diff --git a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
index 98b0cd559..d2c197ac4 100644
--- a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
+++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
@@ -357,7 +357,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 		if (!reader->read_uint16(reader, &len))
 		{
 			DBG1(DBG_TNC, "insufficient data for PTS Simple Component Evidence "
-						  "Verification Policy URI Lenght");
+						  "Verification Policy URI Length");
 			goto end;
 		}
 		if (!reader->read_data(reader, len, &policy_uri))
diff --git a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
index 4062ecf91..27720d509 100644
--- a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
+++ b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
@@ -243,7 +243,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 		if (!reader->read_uint32(reader, &pcr_comp_len))
 		{
 			DBG1(DBG_TNC, "insufficient data for PTS Simple Evidence Final "
-						  "PCR Composite Lenght");
+						  "PCR Composite Length");
 			goto end;
 		}
 		if (!reader->read_data(reader, pcr_comp_len, &this->pcr_comp))
@@ -257,7 +257,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 		if (!reader->read_uint32(reader, &tpm_quote_sig_len))
 		{
 			DBG1(DBG_TNC, "insufficient data for PTS Simple Evidence Final "
-						  "TPM Quote Singature Lenght");
+						  "TPM Quote Singature Length");
 			goto end;
 		}
 		if (!reader->read_data(reader, tpm_quote_sig_len, &this->tpm_quote_sig))
diff --git a/src/libsimaka/simaka_manager.h b/src/libsimaka/simaka_manager.h
index a0edd60b9..64a67e56c 100644
--- a/src/libsimaka/simaka_manager.h
+++ b/src/libsimaka/simaka_manager.h
@@ -113,7 +113,7 @@ struct simaka_manager_t {
 							   identification_t *pseudonym);
 
 	/**
-	 * Get a stored pseudonym from one of the registerd SIM cards.
+	 * Get a stored pseudonym from one of the registered SIM cards.
 	 *
 	 * @param id		permanent identity of the peer
 	 * @return			associated pseudonym identity, NULL if none found
@@ -134,7 +134,7 @@ struct simaka_manager_t {
 							u_int16_t counter);
 
 	/**
-	 * Retrieve fast reauthentication parameters from one of the registerd cards.
+	 * Retrieve fast reauthentication parameters from one of the registered cards.
 	 *
 	 * @param id		permanent identity of the peer
 	 * @param mk		buffer receiving master key MK
diff --git a/src/libstrongswan/credentials/builder.h b/src/libstrongswan/credentials/builder.h
index 70724dc5f..26d19f5a5 100644
--- a/src/libstrongswan/credentials/builder.h
+++ b/src/libstrongswan/credentials/builder.h
@@ -29,7 +29,7 @@ typedef enum builder_part_t builder_part_t;
  * Constructor function to build credentials.
  *
  * Any added parts are cloned/refcounted by the builder implementation.
- * Callers may need to free the passed ressources themselves.
+ * Callers may need to free the passed resources themselves.
  *
  * @param subtype	constructor specific subtype, e.g. a certificate_type_t
  * @param args		list of builder part types, followed by parts, BUILD_END
diff --git a/src/libstrongswan/fetcher/fetcher_manager.h b/src/libstrongswan/fetcher/fetcher_manager.h
index 15250d531..449f284f7 100644
--- a/src/libstrongswan/fetcher/fetcher_manager.h
+++ b/src/libstrongswan/fetcher/fetcher_manager.h
@@ -26,7 +26,7 @@ typedef struct fetcher_manager_t fetcher_manager_t;
 #include <fetcher/fetcher.h>
 
 /**
- * Fetches from URIs using registerd fetcher_t instances.
+ * Fetches from URIs using registered fetcher_t instances.
  */
 struct fetcher_manager_t {
 
diff --git a/testing/testing.conf b/testing/testing.conf
index 265bafed4..26e2cfb7d 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -179,7 +179,7 @@ bob,fec2::10"
 # The hosts stated here will be created. Possible values
 # are sun, moon, dave, carol, alice, venus, bob, winnetou.
 # It's fine to make them all unless you don't have much
-# ressources. In this case we assume you know what you do!
+# resources. In this case we assume you know what you do!
 #
 STRONGSWANHOSTS="sun moon dave carol alice venus bob winnetou"