diff --git a/gis_data_editor.php b/gis_data_editor.php
index 0b447543be..70c96718b3 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 require_once 'libraries/common.inc.php';
 if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
     include_once 'libraries/header_http.inc.php';
diff --git a/js/OpenStreetMap.js b/js/OpenStreetMap.js
index aebfa65db0..8a7f0166d8 100644
--- a/js/OpenStreetMap.js
+++ b/js/OpenStreetMap.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Namespace: Util.OSM
  */
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index 3f7eceac41..bdfaa32199 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used in GIS data editor
  *
diff --git a/js/keyhandler.js b/js/keyhandler.js
index 63a13facfd..40c429f8e3 100644
--- a/js/keyhandler.js
+++ b/js/keyhandler.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
   * Allows moving around inputs/select by Ctrl+arrows
   *
diff --git a/js/makegrid.js b/js/makegrid.js
index 38dc220487..3635f82221 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Create advanced table (resize, reorder, and show/hide columns; and also grid editing).
  * This function is designed mainly for table DOM generated from browsing a table in the database.
diff --git a/js/querywindow.js b/js/querywindow.js
index 0eb1cc13a5..67eef0d55e 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 function PMA_queryAutoCommit()
 {
     var sqlqueryform = document.getElementById('sqlqueryform');
diff --git a/js/server_plugins.js b/js/server_plugins.js
index 9d20edbefc..56f5f8f7db 100644
--- a/js/server_plugins.js
+++ b/js/server_plugins.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in server plugins pages
  */
@@ -27,4 +28,4 @@ $(function() {
     });
     $tables.find('thead th')
         .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">');
-});
\ No newline at end of file
+});
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index f6e5e34e21..b9c686217e 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     // Show tab links
     $('div#statustabs_charting div.tabLinks').show();
diff --git a/js/server_variables.js b/js/server_variables.js
index 691e6677b9..55d2b41357 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     var textFilter = null, odd_row = false;
     var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ';
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index c5693d6af8..1070e2afb4 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 var chart_xaxis_idx = -1;
 var chart_series;
 var chart_series_index = -1;
diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js
index e43a267db5..03016a67b8 100644
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used for visualizing GIS data
  *
diff --git a/libraries/PMA.php b/libraries/PMA.php
index 8bac707cac..4a35ebf03d 100644
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Enter description here...
  * @package PhpMyAdmin
diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php
index f8b9dc9469..d5c59427c2 100644
--- a/libraries/data_drizzle.inc.php
+++ b/libraries/data_drizzle.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by Drizzle
  *
@@ -222,4 +223,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
\ No newline at end of file
+?>
diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php
index 9b1bd481a5..3ea587cab7 100644
--- a/libraries/data_mysql.inc.php
+++ b/libraries/data_mysql.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by MySQL
  *
@@ -283,4 +284,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
\ No newline at end of file
+?>
diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php
index 9c9cdc025a..c62599fedd 100644
--- a/libraries/gis/pma_gis_factory.php
+++ b/libraries/gis/pma_gis_factory.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Factory class that handles the creation of geometric objects.
  *
@@ -47,4 +48,4 @@ class PMA_GIS_Factory
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php
index 58858bc471..ad7e27a470 100644
--- a/libraries/gis/pma_gis_geometry.php
+++ b/libraries/gis/pma_gis_geometry.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Base class for all GIS data type classes.
  *
diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php
index ef2aa7b61c..7ea50e0c7c 100644
--- a/libraries/gis/pma_gis_geometrycollection.php
+++ b/libraries/gis/pma_gis_geometrycollection.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS GEOMETRYCOLLECTION objects.
  *
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index 00c5def482..a874edc03a 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS LINESTRING objects.
  *
diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php
index 1d9582ec48..0700a18767 100644
--- a/libraries/gis/pma_gis_multilinestring.php
+++ b/libraries/gis/pma_gis_multilinestring.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTILINESTRING objects.
  *
diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php
index e88cc4fef8..106c846b5d 100644
--- a/libraries/gis/pma_gis_multipoint.php
+++ b/libraries/gis/pma_gis_multipoint.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOINT objects.
  *
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index 75c1085eb9..42f7d61c43 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOLYGON objects.
  *
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index 457839a834..c18509b96d 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POINT objects.
  *
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index ef8902362a..889e442144 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POLYGON objects.
  *
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 3422217f4f..5410fc3352 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Generates the JavaScripts needed to visualize GIS data.
  *
diff --git a/libraries/gis_visualization.lib.php b/libraries/gis_visualization.lib.php
index f89bb14f43..9ec6cf19c1 100644
--- a/libraries/gis_visualization.lib.php
+++ b/libraries/gis_visualization.lib.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used to generate GIS visualizations.
  *
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index 88220591e7..e935ca271f 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * ESRI Shape file import plugin for phpMyAdmin
  *
diff --git a/libraries/server_variables_doc.php b/libraries/server_variables_doc.php
index dbd19ebbdc..37d183567d 100644
--- a/libraries/server_variables_doc.php
+++ b/libraries/server_variables_doc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Used to create server variables documentation links
  * $VARIABLE_DOC_LINKS[string $name] = array(
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 52e23c86e3..cf762a1ec3 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Overview (main page)
  *
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index e12d5e574d..2cfaa45593 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Menu items
  *
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index b95b817412..d28a17d389 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Server create and edit view
  *
diff --git a/setup/index.php b/setup/index.php
index 5c75eb8664..1b202ba842 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Front controller for setup script
  *
diff --git a/setup/scripts.js b/setup/scripts.js
index e39ccacfb9..1a3d950d88 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in Setup configuration forms
  */
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index ebfbf67041..7060737ea1 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * handles creation of the GIS visualizations.
  *
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index fac9b2720d..5ad7e4c488 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 
 // Adding phpMyAdmin sources to include path
 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")));
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php
index c9b2358db4..ef7ef786a6 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/PMA_Theme_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 
 require_once 'libraries/Theme.class.php';
 
diff --git a/test/classes/_data/gen_version_info/info.inc.php b/test/classes/_data/gen_version_info/info.inc.php
index d4e2e90911..4c0cf6329e 100644
--- a/test/classes/_data/gen_version_info/info.inc.php
+++ b/test/classes/_data/gen_version_info/info.inc.php
@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Full infrmation about theme, including $theme_generation and $theme_version
  */
 $theme_name = 'Test Theme';
 $theme_generation = "2";
-$theme_version = "0.3";
\ No newline at end of file
+$theme_version = "0.3";
diff --git a/test/classes/_data/incorrect_theme/info.inc.php b/test/classes/_data/incorrect_theme/info.inc.php
index af6d242fb5..333d9c2532 100644
--- a/test/classes/_data/incorrect_theme/info.inc.php
+++ b/test/classes/_data/incorrect_theme/info.inc.php
@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Incorrect theme information file.
  * Full name is not specified
  */
 
-$theme_full_version = '1.0';
\ No newline at end of file
+$theme_full_version = '1.0';
diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php
index c426127878..ba0b320a09 100644
--- a/test/classes/gis/PMA_GIS_Factory_test.php
+++ b/test/classes/gis/PMA_GIS_Factory_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Factory
  *
@@ -77,4 +78,4 @@ class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index 24c596efc1..920a44c7f3 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Abstract parent class for all PMA_GIS_<Geom_type> test classes
  *
@@ -71,4 +72,4 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($this->object->scaleRow($spatial), $min_max);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php
index cc9fa86a09..080707addd 100644
--- a/test/classes/gis/PMA_GIS_Geometry_test.php
+++ b/test/classes/gis/PMA_GIS_Geometry_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Geometry
  *
@@ -244,4 +245,4 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php
index e45cf70e92..f8760b9133 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/PMA_GIS_Linestring_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Linestring
  *
@@ -159,4 +160,4 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php
index 18400805f8..aed8f721bf 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multilinestring
  *
@@ -219,4 +220,4 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php
index c088c40340..8bc2119725 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/PMA_GIS_Multipoint_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multipoint
  *
@@ -163,4 +164,4 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php
index bae6859f78..eb1591690c 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multipolygon
  *
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php
index 971bd18894..165c58f848 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/PMA_GIS_Point_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Point
  *
@@ -165,4 +166,4 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php
index 8b9441103c..9d0e951980 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/PMA_GIS_Polygon_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Polygon
  *
@@ -345,4 +346,4 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 209b97e758..863b630402 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Tests for PMA_GIS_modifyQuery method
  *
@@ -91,4 +92,4 @@ class PMA_GIS_modifyQueryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/url.php b/url.php
index 5088eff2c1..23f3ac5b76 100644
--- a/url.php
+++ b/url.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * URL redirector to avoid leaking Referer with some sensitive information.
  */
diff --git a/webapp.php b/webapp.php
index 8affd5c76a..0f7c19028b 100644
--- a/webapp.php
+++ b/webapp.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * generate an WebApp file for Prism / WebRunner
  *