diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index e61afb635..ffca99beb 100644
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -684,7 +684,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
 		tempobjectfp << "\t" "members" "\t";
 		DumpNameList(tempobjectfp, ug->GetMembers());
 		tempobjectfp << "\n"
-			        "\t" "}" "\n";
+				"\t" "}" "\n";
 
 		objectfp << tempobjectfp.str();
 	}
diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index 638514954..2a89d28b5 100644
--- a/lib/config/configcompilercontext.cpp
+++ b/lib/config/configcompilercontext.cpp
@@ -76,7 +76,6 @@ void ConfigCompilerContext::FinishObjectsFile(void)
 		    << boost::errinfo_api_function("rename")
 		    << boost::errinfo_errno(errno)
 		    << boost::errinfo_file_name(tempFilename));
-        }
-
+	}
 }
 
diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 929850654..2e0970fae 100644
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -57,7 +57,7 @@
 	%attribute %string "icon_image",
 	%attribute %string "icon_image_alt",
 
-        %attribute %name(Endpoint) "command_endpoint",
+	%attribute %name(Endpoint) "command_endpoint",
 }
 
 %type Host %inherits Checkable {
@@ -139,7 +139,7 @@
 		%attribute %number "*"
 	},
 
-        %attribute %name(Endpoint) "command_endpoint",
+	%attribute %name(Endpoint) "command_endpoint",
 }
 
 %type User {
diff --git a/lib/livestatus/commentstable.cpp b/lib/livestatus/commentstable.cpp
index 89c0c6ff2..475415983 100644
--- a/lib/livestatus/commentstable.cpp
+++ b/lib/livestatus/commentstable.cpp
@@ -98,9 +98,9 @@ Object::Ptr CommentsTable::HostAccessor(const Value& row, const Column::ObjectAc
 
 	Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId());
 
-        Host::Ptr host;
-        Service::Ptr service;
-        tie(host, service) = GetHostService(checkable);
+	Host::Ptr host;
+	Service::Ptr service;
+	tie(host, service) = GetHostService(checkable);
 
 	return host;
 }
@@ -111,9 +111,9 @@ Object::Ptr CommentsTable::ServiceAccessor(const Value& row, const Column::Objec
 
 	Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId());
 
-        Host::Ptr host;
-        Service::Ptr service;
-        tie(host, service) = GetHostService(checkable);
+	Host::Ptr host;
+	Service::Ptr service;
+	tie(host, service) = GetHostService(checkable);
 
 	return service;
 }
diff --git a/lib/livestatus/downtimestable.cpp b/lib/livestatus/downtimestable.cpp
index b02804b49..742ff8206 100644
--- a/lib/livestatus/downtimestable.cpp
+++ b/lib/livestatus/downtimestable.cpp
@@ -98,9 +98,9 @@ Object::Ptr DowntimesTable::HostAccessor(const Value& row, const Column::ObjectA
 
 	Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId());
 
-        Host::Ptr host;
-        Service::Ptr service;
-        tie(host, service) = GetHostService(checkable);
+	Host::Ptr host;
+	Service::Ptr service;
+	tie(host, service) = GetHostService(checkable);
 
 	return host;
 }
@@ -111,9 +111,9 @@ Object::Ptr DowntimesTable::ServiceAccessor(const Value& row, const Column::Obje
 
 	Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId());
 
-        Host::Ptr host;
-        Service::Ptr service;
-        tie(host, service) = GetHostService(checkable);
+	Host::Ptr host;
+	Service::Ptr service;
+	tie(host, service) = GetHostService(checkable);
 
 	return service;
 }
diff --git a/lib/methods/plugineventtask.hpp b/lib/methods/plugineventtask.hpp
index c3af9e9bc..44cd6ff39 100644
--- a/lib/methods/plugineventtask.hpp
+++ b/lib/methods/plugineventtask.hpp
@@ -36,7 +36,7 @@ class I2_METHODS_API PluginEventTask
 {
 public:
 	static void ScriptFunc(const Checkable::Ptr& service,
-            const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
+	    const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
 
 private:
 	PluginEventTask(void);
diff --git a/lib/methods/pluginnotificationtask.hpp b/lib/methods/pluginnotificationtask.hpp
index 5b446a4cf..81dee9d23 100644
--- a/lib/methods/pluginnotificationtask.hpp
+++ b/lib/methods/pluginnotificationtask.hpp
@@ -39,7 +39,7 @@ public:
 	static void ScriptFunc(const Notification::Ptr& notification,
 	    const User::Ptr& user, const CheckResult::Ptr& cr, int itype,
 	    const String& author, const String& comment,
-            const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
+	    const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
 
 private:
 	PluginNotificationTask(void);
diff --git a/lib/perfdata/perfdata-type.conf b/lib/perfdata/perfdata-type.conf
index 2aa5b9b41..99245b253 100644
--- a/lib/perfdata/perfdata-type.conf
+++ b/lib/perfdata/perfdata-type.conf
@@ -35,8 +35,8 @@
 }
 
 %type GelfWriter {
-        %attribute %string "host",
-        %attribute %string "port",
-        %attribute %string "source"
+	%attribute %string "host",
+	%attribute %string "port",
+	%attribute %string "source"
 }