diff --git a/examples/audio-controller.py b/examples/audio-controller.py
index 990b96793c..0804af6ff9 100644
--- a/examples/audio-controller.py
+++ b/examples/audio-controller.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
 
 # audio-controller.py
 # (c) 2005 Edward Hervey <edward at fluendo dot com>
diff --git a/examples/audioconcat.py b/examples/audioconcat.py
index 7acb32288a..3797a31b1f 100644
--- a/examples/audioconcat.py
+++ b/examples/audioconcat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
 
 # audio concat tool
 # takes in one or more audio files and creates one audio file of the combination
diff --git a/examples/bps.py b/examples/bps.py
index 1e582bbc7b..495063db99 100755
--- a/examples/bps.py
+++ b/examples/bps.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2003 David I. Lehn
 #
diff --git a/examples/cp.py b/examples/cp.py
index 5e4c22420f..0330fe3d4e 100755
--- a/examples/cp.py
+++ b/examples/cp.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2002 David I. Lehn <dlehn@users.sourceforge.net>
 #               2004 Johan Dahlin  <johan@gnome.org>
diff --git a/examples/debugslider.py b/examples/debugslider.py
index 5ca8db909a..d544e72da1 100644
--- a/examples/debugslider.py
+++ b/examples/debugslider.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2005 Fluendo S.L.
 #
diff --git a/examples/f2f.py b/examples/f2f.py
index fd94c00e5a..4fb5614f3e 100755
--- a/examples/f2f.py
+++ b/examples/f2f.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2002 David I. Lehn
 #
diff --git a/examples/filesrc.py b/examples/filesrc.py
index b2e680be79..79de417d7d 100755
--- a/examples/filesrc.py
+++ b/examples/filesrc.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # GStreamer python bindings
 # Copyright (C) 2002 David I. Lehn <dlehn@users.sourceforge.net>
 #               2004 Johan Dahlin  <johan@gnome.org>
diff --git a/examples/fvumeter.py b/examples/fvumeter.py
index d490e52378..cabf09f593 100644
--- a/examples/fvumeter.py
+++ b/examples/fvumeter.py
@@ -1,3 +1,6 @@
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2005 Fluendo S.L.
 # Originally from the Flumotion streaming server.
diff --git a/examples/gstfile.py b/examples/gstfile.py
index 49287ec8ea..57fa0c5a74 100644
--- a/examples/gstfile.py
+++ b/examples/gstfile.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
 
 # gstfile.py
 # (c) 2005 Edward Hervey <edward at fluendo dot com>
diff --git a/examples/play.py b/examples/play.py
index 7563e8120b..57707767b4 100644
--- a/examples/play.py
+++ b/examples/play.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 import pygtk
 pygtk.require('2.0')
 
diff --git a/examples/sinkelement.py b/examples/sinkelement.py
index acfa8d0b9c..df2bb6e7c0 100644
--- a/examples/sinkelement.py
+++ b/examples/sinkelement.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # sinkelement.py
 # (c) 2005 Edward Hervey <edward@fluendo.com>
 # Licensed under LGPL
diff --git a/examples/vorbisplay.py b/examples/vorbisplay.py
index 2919c8cf4f..2ff668851e 100755
--- a/examples/vorbisplay.py
+++ b/examples/vorbisplay.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2003 David I. Lehn
 #
diff --git a/examples/vumeter.py b/examples/vumeter.py
index aba621c603..57899e93c4 100755
--- a/examples/vumeter.py
+++ b/examples/vumeter.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-#
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
 # gst-python
 # Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
 #