diff --git a/ChangeLog b/ChangeLog
index 5ddeff5f4..53a9ec244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,3 @@
-A summary of changes is available in the NEWS file. For a more 
+A summary of changes is available in the NEWS file. For a more
 detailed Changelog, use the repository (see HACKING) or the
 online interface available at http://git.strongswan.org.
diff --git a/HACKING b/HACKING
index 02d540a9a..0162f5a15 100644
--- a/HACKING
+++ b/HACKING
@@ -1,6 +1,6 @@
-                 -------------------------
-                  strongSwan - Development
-                 -------------------------
+                ------------------------
+                strongSwan - Development
+                ------------------------
 
 Git repository
 ---------------------
@@ -27,11 +27,11 @@ the code, you need the following tools:
 
 To check out the master branch, use:
 
-   git clone git://git.strongswan.org/strongswan.git
+    git clone git://git.strongswan.org/strongswan.git
 
-     or using HTTP
+or using HTTP:
 
-   git clone http://git.strongswan.org/strongswan.git
+    git clone http://git.strongswan.org/strongswan.git
 
 After a successful check out, give the autotools a try:
 
diff --git a/INSTALL b/INSTALL
index 029b9a284..c703c50f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,18 +1,18 @@
-                 ---------------------------
-                  strongSwan - Installation
-                 ---------------------------
+                -------------------------
+                strongSwan - Installation
+                -------------------------
 
 
 Contents
 --------
 
-   1.   Overview
-   2.   Required packages
-   3.   Optional packages
-   3.1   HTTP fetcher
-   3.2   LDAP
-   3.3   Other pluggable modules
-   4.   Kernel configuration
+    1.   Overview
+    2.   Required packages
+    3.   Optional packages
+    3.1   HTTP fetcher
+    3.2   LDAP
+    3.3   Other pluggable modules
+    4.   Kernel configuration
 
 1.  Overview
     --------
@@ -104,7 +104,7 @@ Contents
     In order to activate the use of the libldap library in strongSwan you must
     enable the ./configure switch:
 
-       ./configure [...] --enable-ldap
+      ./configure [...] --enable-ldap
 
     LDAP Protocol version 2 is not supported anymore, --enable-ldap uses always
     version 3 of the LDAP protocol
@@ -144,5 +144,5 @@ Contents
 
     For a more up-to-date list of recommended modules refer to:
 
-     * http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules
+      * http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules
 
diff --git a/NEWS b/NEWS
index 7976f3cec..d559df1a1 100644
--- a/NEWS
+++ b/NEWS
@@ -1217,9 +1217,9 @@ strongswan-4.6.1
   thus causing failures during the loading of the plugins which depend on these
   libraries for resolving external symbols.
 
--  Therefore our approach of computing  integrity checksums for plugins had to be
-   changed radically by moving the hash generation from the compilation to the
-   post-installation phase.
+- Therefore our approach of computing  integrity checksums for plugins had to be
+  changed radically by moving the hash generation from the compilation to the
+  post-installation phase.
 
 
 strongswan-4.6.0
@@ -2327,7 +2327,7 @@ strongswan-4.1.4
   Thanks to the rightallowany flag the connection behaves later on
   as
 
-   right=%any
+    right=%any
 
   so that the peer can rekey the connection as an initiator when his
   IP address changes. An alternative notation is
@@ -2384,8 +2384,8 @@ strongswan-4.1.3
   is provided and more advanced backends (using e.g. a database) are trivial
   to implement.
 
- - Fixed a compilation failure in libfreeswan occurring with Linux kernel
-   headers > 2.6.17.
+- Fixed a compilation failure in libfreeswan occurring with Linux kernel
+  headers > 2.6.17.
 
 
 strongswan-4.1.2
@@ -2535,7 +2535,7 @@ strongswan-4.0.5
   The debugging levels can either be specified statically in ipsec.conf as
 
     config setup
-           charondebug="lib 1, cfg 3, net 2"
+        charondebug="lib 1, cfg 3, net 2"
 
   or changed at runtime via stroke as
 
@@ -2777,9 +2777,9 @@ strongswan-2.6.2
   if an FQDN, USER_FQDN, or Key ID was defined, as in the following example.
 
   conn rw
-       right=%any
-       rightid=@foo.bar
-       authby=secret
+      right=%any
+      rightid=@foo.bar
+      authby=secret
 
 - the ipsec command now supports most ipsec auto commands (e.g. ipsec listall).
 
@@ -2922,7 +2922,7 @@ strongswan-2.5.3
 
 - fixed the initialization of the ESP key length to a default of
   128 bits in the case that the peer does not send a key length
-   attribute for AES encryption.
+  attribute for AES encryption.
 
 - applied Herbert Xu's uniqueIDs patch
 
@@ -3327,16 +3327,16 @@ strongswan-2.1.0
 - The new "ca" section allows to define the following parameters:
 
   ca kool
-     cacert=koolCA.pem                   # cacert of kool CA
-     ocspuri=http://ocsp.kool.net:8001   # ocsp server
-     ldapserver=ldap.kool.net            # default ldap server
-     crluri=http://www.kool.net/kool.crl # crl distribution point
-     crluri2="ldap:///O=Kool, C= .."     # crl distribution point #2
-     auto=add                            # add, ignore
+      cacert=koolCA.pem                   # cacert of kool CA
+      ocspuri=http://ocsp.kool.net:8001   # ocsp server
+      ldapserver=ldap.kool.net            # default ldap server
+      crluri=http://www.kool.net/kool.crl # crl distribution point
+      crluri2="ldap:///O=Kool, C= .."     # crl distribution point #2
+      auto=add                            # add, ignore
 
   The ca definitions can be monitored via the command
 
-     ipsec auto --listcainfos
+    ipsec auto --listcainfos
 
 - Fixed cosmetic corruption of /proc filesystem by integrating
   D. Hugh Redelmeier's freeswan-2.06 kernel fixes.