diff --git a/.gitignore b/.gitignore
index 77f0c97cc3ed1208df9e2acc63ebbbea862de2e2..5ef3cbd8b6350a90bf97e48ad36c4eb728ce2469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,4 +69,5 @@
 # scripts
 /scripts/gnt-cluster
 /scripts/gnt-debug
+/scripts/gnt-node
 /scripts/gnt-os
diff --git a/Makefile.am b/Makefile.am
index 14639c27bfc20512fe01de4d4c6ec969e1dbd2df..9a8feb57eec77620837be4270d71399bca0483ec 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_node.py \
 	lib/client/gnt_os.py
 
 hypervisor_PYTHON = \
@@ -260,6 +261,7 @@ gnt_scripts = \
 PYTHON_BOOTSTRAP = \
 	scripts/gnt-cluster \
 	scripts/gnt-debug \
+	scripts/gnt-node \
 	scripts/gnt-os
 
 dist_sbin_SCRIPTS = \
@@ -270,8 +272,7 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-rapi \
 	scripts/gnt-backup \
 	scripts/gnt-instance \
-	scripts/gnt-job \
-	scripts/gnt-node
+	scripts/gnt-job
 
 nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP) \
diff --git a/scripts/gnt-node b/lib/client/gnt_node.py
old mode 100755
new mode 100644
similarity index 99%
rename from scripts/gnt-node
rename to lib/client/gnt_node.py
index 645c5439a7bfd38c9f923467f2b8408216eeda5b..26e5ca8d192dfcb310612d0effbe23057ade0e97
--- a/scripts/gnt-node
+++ b/lib/client/gnt_node.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
@@ -26,8 +26,6 @@
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-node
 
-import sys
-
 from ganeti.cli import *
 from ganeti import bootstrap
 from ganeti import opcodes
@@ -760,5 +758,5 @@ commands = {
   }
 
 
-if __name__ == '__main__':
-  sys.exit(GenericMain(commands, override={"tag_type": constants.TAG_NODE}))
+def Main():
+  return GenericMain(commands, override={"tag_type": constants.TAG_NODE})