8 files changed, 13 insertions, 12 deletions
diff --git a/scripts/build-config b/scripts/build-config
index d273717f..9ea92e1f 100755
--- a/scripts/build-config
+++ b/scripts/build-config
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/scripts/check-build-env b/scripts/check-build-env
index 6dcf885b..7f02c02a 100755
--- a/scripts/check-build-env
+++ b/scripts/check-build-env
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
@@ -32,7 +32,7 @@ deps = {
        'live-build',
        'pbuilder',
        'devscripts',
-       'python-pystache'
+       'python3-pystache'
     ],
    'binaries': []
 }
diff --git a/scripts/check-config b/scripts/check-config
index 55d5467a..d2236619 100755
--- a/scripts/check-config
+++ b/scripts/check-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
diff --git a/scripts/check-vm-build-env b/scripts/check-vm-build-env
index c32f2b13..8efab848 100755
--- a/scripts/check-vm-build-env
+++ b/scripts/check-vm-build-env
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
diff --git a/scripts/live-build-config b/scripts/live-build-config
index cb9e84dc..2e2d4704 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
diff --git a/scripts/make-version-file b/scripts/make-version-file
index 6c597090..3bb33319 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+#
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,7 +20,6 @@
 #   that is included in the image and used by 'show version' command
 #   and install/upgrade scripts.
 
-from __future__ import print_function
 import os
 import datetime
 import json
diff --git a/scripts/pbuilder-setup b/scripts/pbuilder-setup
index fbd49a4f..a89348b8 100755
--- a/scripts/pbuilder-setup
+++ b/scripts/pbuilder-setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2015 VyOS maintainers and contributors
 #
@@ -50,4 +50,3 @@ result = os.system(pbuilder_create_command)
 if result > 0:
     print("pbuilder environment bootstrap failed")
     sys.exit(1)
-
diff --git a/scripts/query-json b/scripts/query-json
index 23e64ef7..2f1ea32f 100755
--- a/scripts/query-json
+++ b/scripts/query-json
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+#
 # Copyright (C) 2016 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File: query-config
-# Purpose: Extracts field values a flat JSON file,
+# Purpose: Extracts field values from a flat JSON file,
 #          for use in languages that can't handle JSON easily,
 #          (I'm looking at you, Bourne shell!)