diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 1d9203fcff..abd9367723 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -196,10 +196,10 @@
       <varlistentry>
         <term><option>--no-output</option></term>
 
-	<listitem><para>Do not print passwords to standard output.
-	This is useful if you want to store a password in kernel
-	keyring with <option>--keyname</option> but do not want it
-	to show up on screen or in logs.</para></listitem>
+        <listitem><para>Do not print passwords to standard output.
+        This is useful if you want to store a password in kernel
+        keyring with <option>--keyname</option> but do not want it
+        to show up on screen or in logs.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 5d7b6ca12a..3ead519d07 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -146,8 +146,8 @@
         <term><option>-r</option></term>
         <term><option>--raw</option></term>
 
-	<listitem><para>Format byte counts (as in memory usage and I/O metrics)
-	with raw numeric values rather than human-readable
+        <listitem><para>Format byte counts (as in memory usage and I/O metrics)
+        with raw numeric values rather than human-readable
         numbers.</para></listitem>
       </varlistentry>
 
diff --git a/man/udevadm.xml b/man/udevadm.xml
index 60f43b2b4a..3a862f540b 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -298,11 +298,11 @@
           <term><option>-y</option></term>
           <term><option>--sysname-match=<replaceable>PATH</replaceable></option></term>
           <listitem>
-	    <para>Trigger events for devices for which the last component
-	    (i.e. the filename) of the <filename>/sys</filename> path matches
-	    the specified <replaceable>PATH</replaceable>. This option can be
-	    specified multiple times and also supports shell style pattern
-	    matching.</para>
+            <para>Trigger events for devices for which the last component
+            (i.e. the filename) of the <filename>/sys</filename> path matches
+            the specified <replaceable>PATH</replaceable>. This option can be
+            specified multiple times and also supports shell style pattern
+            matching.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
diff --git a/src/basic/MurmurHash2.c b/src/basic/MurmurHash2.c
index 47adfb4d0a..5859af0a81 100644
--- a/src/basic/MurmurHash2.c
+++ b/src/basic/MurmurHash2.c
@@ -30,7 +30,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 
 // Other compilers
 
-#else	// defined(_MSC_VER)
+#else        // defined(_MSC_VER)
 
 #define BIG_CONSTANT(x) (x##LLU)
 
diff --git a/src/basic/MurmurHash2.h b/src/basic/MurmurHash2.h
index 93362dd485..6104b4fbe6 100644
--- a/src/basic/MurmurHash2.h
+++ b/src/basic/MurmurHash2.h
@@ -18,7 +18,7 @@ typedef unsigned __int64 uint64_t;
 
 // Other compilers
 
-#else	// defined(_MSC_VER)
+#else        // defined(_MSC_VER)
 
 #include <stdint.h>
 
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 9cfbb1171e..a8b4c8224c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4194,12 +4194,12 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (arg_start_mode == START_BOOT) {
-			const char *p;
+                        const char *p;
 
-			if (arg_pivot_root_new)
-				p = prefix_roota(arg_directory, arg_pivot_root_new);
-			else
-				p = arg_directory;
+                        if (arg_pivot_root_new)
+                                p = prefix_roota(arg_directory, arg_pivot_root_new);
+                        else
+                                p = arg_directory;
 
                         if (path_is_os_tree(p) <= 0) {
                                 log_error("Directory %s doesn't look like an OS root directory (os-release file is missing). Refusing.", p);
@@ -4209,10 +4209,10 @@ int main(int argc, char *argv[]) {
                 } else {
                         const char *p, *q;
 
-			if (arg_pivot_root_new)
-				p = prefix_roota(arg_directory, arg_pivot_root_new);
-			else
-				p = arg_directory;
+                        if (arg_pivot_root_new)
+                                p = prefix_roota(arg_directory, arg_pivot_root_new);
+                        else
+                                p = arg_directory;
 
                         q = strjoina(p, "/usr/");