diff --git a/.gitignore b/.gitignore
index 5ef3cbd8b6350a90bf97e48ad36c4eb728ce2469..1808b4082cb13964bf7a9187b2545b4d25c1aebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,5 +69,6 @@
 # scripts
 /scripts/gnt-cluster
 /scripts/gnt-debug
+/scripts/gnt-job
 /scripts/gnt-node
 /scripts/gnt-os
diff --git a/Makefile.am b/Makefile.am
index 9a8feb57eec77620837be4270d71399bca0483ec..138acd962ac756e54679c2140288cf854ebb84f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,6 +141,7 @@ client_PYTHON = \
 	lib/client/__init__.py \
 	lib/client/gnt_cluster.py \
 	lib/client/gnt_debug.py \
+	lib/client/gnt_job.py \
 	lib/client/gnt_node.py \
 	lib/client/gnt_os.py
 
@@ -261,6 +262,7 @@ gnt_scripts = \
 PYTHON_BOOTSTRAP = \
 	scripts/gnt-cluster \
 	scripts/gnt-debug \
+	scripts/gnt-job \
 	scripts/gnt-node \
 	scripts/gnt-os
 
@@ -271,8 +273,7 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-confd \
 	daemons/ganeti-rapi \
 	scripts/gnt-backup \
-	scripts/gnt-instance \
-	scripts/gnt-job
+	scripts/gnt-instance
 
 nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP) \
diff --git a/scripts/gnt-job b/lib/client/gnt_job.py
old mode 100755
new mode 100644
similarity index 99%
rename from scripts/gnt-job
rename to lib/client/gnt_job.py
index 9d58528707eaaadba9a40a06a7829851354ba6ad..99519280f798b52236bafe040a201ab2a86a9e3e
--- a/scripts/gnt-job
+++ b/lib/client/gnt_job.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007 Google Inc.
@@ -26,8 +26,6 @@
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-job
 
-import sys
-
 from ganeti.cli import *
 from ganeti import constants
 from ganeti import errors
@@ -388,5 +386,5 @@ commands = {
   }
 
 
-if __name__ == '__main__':
-  sys.exit(GenericMain(commands))
+def Main():
+  return GenericMain(commands)