diff --git a/doc/ja/FAQ.txt b/doc/ja/FAQ.txt
index fce5eef5d..50238ffde 100644
--- a/doc/ja/FAQ.txt
+++ b/doc/ja/FAQ.txt
@@ -32,8 +32,8 @@ error when starting a container.
 "[syserr] lxc_start:96: Invalid argument - failed to fork into a new
 namespace"
 
-Answer: 
-------- 
+Answer:
+-------
 
 read the lxc man page about kernel version prereq :) most probably
 your kernel is not configured to support the container options you
diff --git a/doc/ja/lxc-clone.sgml.in b/doc/ja/lxc-clone.sgml.in
index 69b71e3db..d0a1e2410 100644
--- a/doc/ja/lxc-clone.sgml.in
+++ b/doc/ja/lxc-clone.sgml.in
@@ -215,7 +215,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	    The lxcpath of the original container.  By default, the system
 	    wide configured lxcpath will be used.
             -->
-            オリジナルのコンテナの lxcpath．デフォルトでは，システム全体で設定された lxcpath が使われます．            
+            オリジナルのコンテナの lxcpath．デフォルトでは，システム全体で設定された lxcpath が使われます．
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/doc/ja/lxc-snapshot.sgml.in b/doc/ja/lxc-snapshot.sgml.in
index 7bebf9429..c31423461 100644
--- a/doc/ja/lxc-snapshot.sgml.in
+++ b/doc/ja/lxc-snapshot.sgml.in
@@ -112,7 +112,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	   <listitem>
 	    <para>
               <!--
-              List existing snapshots. 
+              List existing snapshots.
               -->
               存在するスナップショットをリスト表示します．
             </para>
@@ -124,7 +124,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	   <listitem>
 	    <para>
               <!--
-              Show snapshot comments in the snapshots listings. 
+              Show snapshot comments in the snapshots listings.
               -->
               スナップショットのリスト表示でスナップショットに対するコメントを表示します．
             </para>
diff --git a/lxc.spec.in b/lxc.spec.in
index 3ef588118..763ce51a8 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -52,8 +52,8 @@ BuildRequires: python3-devel
 
 %description
 Containers are insulated areas inside a system, which have their own namespace
-for filesystem, network, PID, IPC, CPU and memory allocation and which can be 
-created using the Control Group and Namespace features included in the Linux  
+for filesystem, network, PID, IPC, CPU and memory allocation and which can be
+created using the Control Group and Namespace features included in the Linux
 kernel.
 
 This package provides the lxc-* tools, which can be used to start a single
diff --git a/src/lxc/attach_options.h b/src/lxc/attach_options.h
index 3255183f1..70a39a9a6 100644
--- a/src/lxc/attach_options.h
+++ b/src/lxc/attach_options.h
@@ -40,7 +40,7 @@ enum {
 	LXC_ATTACH_MOVE_TO_CGROUP        = 0x00000001, //!< Move to cgroup
 	LXC_ATTACH_DROP_CAPABILITIES     = 0x00000002, //!< Drop capabilities
 	LXC_ATTACH_SET_PERSONALITY       = 0x00000004, //!< Set personality
-	LXC_ATTACH_LSM_EXEC              = 0x00000008, //!< Execute under a Linux Security Module 
+	LXC_ATTACH_LSM_EXEC              = 0x00000008, //!< Execute under a Linux Security Module
 
 	/* the following are off by default */
 	LXC_ATTACH_REMOUNT_PROC_SYS      = 0x00010000, //!< Remount /proc filesystem
diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index 7af24e5d3..6295354cb 100644
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -149,7 +149,7 @@ struct lxc_container {
 	 * \brief Determine process ID of the containers init process.
 	 *
 	 * \param c Container.
-	 * 
+	 *
 	 * \return pid of init process as seen from outside the
 	 *  container.
 	 */
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 5bfe9dba2..97c252d51 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -253,7 +253,7 @@ const char *lxc_global_config_value(const char *option_name)
 		{ "cgroup.use",      NULL            },
 		{ NULL, NULL },
 	};
-	/* Protected by a mutex to eliminate conflicting load and store operations */ 
+	/* Protected by a mutex to eliminate conflicting load and store operations */
 	static const char *values[sizeof(options) / sizeof(options[0])] = { 0 };
 	const char *(*ptr)[2];
 	const char *value;
diff --git a/src/tests/reboot.c b/src/tests/reboot.c
index 0b8738ee2..2b49ecf24 100644
--- a/src/tests/reboot.c
+++ b/src/tests/reboot.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright � 2012 Serge Hallyn <serge.hallyn@ubuntu.com>.
  * Copyright � 2012 Canonical Ltd.
  *
diff --git a/templates/lxc-openmandriva.in b/templates/lxc-openmandriva.in
index 3a1fa2734..70c3a21e4 100644
--- a/templates/lxc-openmandriva.in
+++ b/templates/lxc-openmandriva.in
@@ -343,7 +343,7 @@ if [ $? -ne 0 ]; then
 fi
 eval set -- "$options"
 
-release=${release:-"cooker"} 
+release=${release:-"cooker"}
 if [ -f /etc/lsb-release ]; then
     . /etc/lsb-release
     if [ "$DISTRIB_ID" = "OpenMandrivaLinux" ]; then