diff --git a/doc/architecture.h b/doc/architecture.h
index 47d8202c2..a95bffae9 100644
--- a/doc/architecture.h
+++ b/doc/architecture.h
@@ -47,10 +47,10 @@ Since IKEv2 uses the same port as IKEv1, both daemons must listen to UDP port
 500. Under Linux, there is no clean way to set up two sockets at the same port.
 To reslove this problem, charon uses a RAW socket, as they are used in network
 sniffers. An installed Linux Socket Filter (LSF) filters out all none-IKEv2
-traffic. Pluto receives any IKE message, independent of charons behavior.
+traffic. Pluto receives any IKE message, independent of charon's behavior.
 Therefore plutos behavior is changed to discard any IKEv2 traffic silently.
 
 To gain some reusability of the code, generic crypto and utility functions are 
 separeted in a shared library, libstrongswan.
 
-*/
\ No newline at end of file
+*/
diff --git a/src/libcharon/sa/ike_sa_id.h b/src/libcharon/sa/ike_sa_id.h
index 065c2a897..fb55359bc 100644
--- a/src/libcharon/sa/ike_sa_id.h
+++ b/src/libcharon/sa/ike_sa_id.h
@@ -30,7 +30,7 @@ typedef struct ike_sa_id_t ike_sa_id_t;
  * An object of type ike_sa_id_t is used to identify an IKE_SA.
  *
  * An IKE_SA is identified by its initiator and responder spi's.
- * Additionally it contains the role of the actual running IKEv2-Daemon
+ * Additionally it contains the role of the actual running IKEv2 daemon
  * for the specific IKE_SA (original initiator or responder).
  */
 struct ike_sa_id_t {
@@ -88,14 +88,14 @@ struct ike_sa_id_t {
 	/**
 	 * Get the initiator flag.
 	 *
-	 * @return					TRUE if we are the original initator
+	 * @return					TRUE if we are the original initiator
 	 */
 	bool (*is_initiator) (ike_sa_id_t *this);
 
 	/**
 	 * Switche the original initiator flag.
 	 *
-	 * @return					TRUE if we are the original initator after switch, FALSE otherwise
+	 * @return					TRUE if we are the original initiator after switch, FALSE otherwise
 	 */
 	bool (*switch_initiator) (ike_sa_id_t *this);
 
diff --git a/src/libstrongswan/plugins/hmac/hmac.h b/src/libstrongswan/plugins/hmac/hmac.h
index 4e53ddf1f..1ed041596 100644
--- a/src/libstrongswan/plugins/hmac/hmac.h
+++ b/src/libstrongswan/plugins/hmac/hmac.h
@@ -29,7 +29,7 @@ typedef struct hmac_t hmac_t;
 /**
  * Message authentication using hash functions.
  *
- * This class implements the message authenticaion algorithm
+ * This class implements the message authentication algorithm
  * described in RFC2104. It uses a hash function, which must
  * be implemented as a hasher_t class.
  */