diff --git a/tool/Command.cpp b/tool/Command.cpp
index 565999e1c66fa754610d678a652b58ad866e22d9..16db9141769f9ea25d0ce11bf2dfb1ff6578c711 100644
--- a/tool/Command.cpp
+++ b/tool/Command.cpp
@@ -25,6 +25,8 @@
  *  EtherCAT technology and brand is only permitted in compliance with the
  *  industrial property and similar rights of Beckhoff Automation GmbH.
  *
+ *  vim: expandtab
+ *
  ****************************************************************************/
 
 #include "Command.h"
@@ -189,35 +191,35 @@ void Command::throwSingleSlaveRequired(unsigned int size) const
 
 Command::MasterIndexList Command::getMasterIndices() const
 {
-	MasterIndexList indices;
+    MasterIndexList indices;
 
     try {
         MasterIndexParser p;
         indices = p.parse(masters.c_str());
     } catch (MasterDeviceException &e) {
-		stringstream err;
-		err << "Failed to obtain number of masters: " << e.what();
-		throwCommandException(err);
+        stringstream err;
+        err << "Failed to obtain number of masters: " << e.what();
+        throwCommandException(err);
     } catch (runtime_error &e) {
-		stringstream err;
+        stringstream err;
         err << "Invalid master argument '" << masters << "': " << e.what();
-		throwInvalidUsageException(err);
+        throwInvalidUsageException(err);
     }
 
-	return indices;
+    return indices;
 }
 
 /*****************************************************************************/
 
 unsigned int Command::getSingleMasterIndex() const
 {
-	MasterIndexList masterIndices = getMasterIndices();
+    MasterIndexList masterIndices = getMasterIndices();
     if (masterIndices.size() != 1) {
-		stringstream err;
+        stringstream err;
         err << getName() << " requires to select a single master!";
         throwInvalidUsageException(err);
     }
-	return masterIndices.front();
+    return masterIndices.front();
 }
 
 /*****************************************************************************/
diff --git a/tool/CommandConfig.cpp b/tool/CommandConfig.cpp
index 4cf901b2555c4a9843dd03d36b5d7b67bde1021b..4129db0884c1a5a0fc6c53996d8e916e49778e59 100644
--- a/tool/CommandConfig.cpp
+++ b/tool/CommandConfig.cpp
@@ -25,6 +25,8 @@
  *  EtherCAT technology and brand is only permitted in compliance with the
  *  industrial property and similar rights of Beckhoff Automation GmbH.
  *
+ *  vim: expandtab
+ *
  ****************************************************************************/
 
 #include <list>
@@ -104,7 +106,7 @@ string CommandConfig::helpString() const
  */
 void CommandConfig::execute(const StringVector &args)
 {
-	MasterIndexList masterIndices;
+    MasterIndexList masterIndices;
     bool doIndent;
     ConfigList configs;
 
@@ -114,7 +116,7 @@ void CommandConfig::execute(const StringVector &args)
         throwInvalidUsageException(err);
     }
 
-	masterIndices = getMasterIndices();
+    masterIndices = getMasterIndices();
     doIndent = masterIndices.size() > 1;
     MasterIndexList::const_iterator mi;
     for (mi = masterIndices.begin();
diff --git a/tool/CommandData.cpp b/tool/CommandData.cpp
index c172a9765de02accd4613299f4119225bae95c4b..d31307c39f1a7c0899625ecf49033f0298093db2 100644
--- a/tool/CommandData.cpp
+++ b/tool/CommandData.cpp
@@ -25,6 +25,8 @@
  *  EtherCAT technology and brand is only permitted in compliance with the
  *  industrial property and similar rights of Beckhoff Automation GmbH.
  *
+ *  vim: expandtab
+ *
  ****************************************************************************/
 
 #include <iostream>
@@ -66,7 +68,7 @@ string CommandData::helpString() const
 
 void CommandData::execute(const StringVector &args)
 {
-	MasterIndexList masterIndices;
+    MasterIndexList masterIndices;
     DomainList domains;
     DomainList::const_iterator di;
 
@@ -76,7 +78,7 @@ void CommandData::execute(const StringVector &args)
         throwInvalidUsageException(err);
     }
 
-	masterIndices = getMasterIndices();
+    masterIndices = getMasterIndices();
     MasterIndexList::const_iterator mi;
     for (mi = masterIndices.begin();
             mi != masterIndices.end(); mi++) {
diff --git a/tool/CommandDebug.cpp b/tool/CommandDebug.cpp
index 0d31441e1df9f8cda630235a22d2be99bb177838..df0548e80751100ed4f896089616c35f0fb36ee7 100644
--- a/tool/CommandDebug.cpp
+++ b/tool/CommandDebug.cpp
@@ -25,6 +25,8 @@
  *  EtherCAT technology and brand is only permitted in compliance with the
  *  industrial property and similar rights of Beckhoff Automation GmbH.
  *
+ *  vim: expandtab
+ *
  ****************************************************************************/
 
 #include <sstream>