Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -82,13 +82,16 @@
 	mkdir coverage.dir
 	genhtml nano-coverage.info --output-directory coverage.dir
 	rm -f nano-coverage.info
 endif
 
-install: @EXTENSION_TARGET@ pkgIndex.tcl @srcdir@/nano.man
+install: @EXTENSION_TARGET@ @srcdir@/bin/node @srcdir@/bin/rpc-client pkgIndex.tcl @srcdir@/nano.man
 	$(INSTALL) -d '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+	$(INSTALL) -d '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/bin'
 	$(INSTALL_PROGRAM) @EXTENSION_TARGET@ '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+	$(INSTALL_PROGRAM) @srcdir@/bin/node '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/bin'
+	$(INSTALL_PROGRAM) @srcdir@/bin/rpc-client '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/bin'
 	$(INSTALL_DATA)    pkgIndex.tcl '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
 	$(INSTALL_DATA)    @srcdir@/nano.man '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
  
 clean:
 	rm -f nano-amalgamation.c nano-amalgamation.o

ADDED   bin/node
Index: bin/node
==================================================================
--- /dev/null
+++ bin/node
@@ -0,0 +1,43 @@
+#! /usr/bin/env tclsh
+
+package require nano
+
+# Process command-line options
+## Set defaults
+set network main
+
+## Process
+if {[llength $argv] % 2 != 0} {
+	lappend argv ""
+}
+foreach {opt optval} $argv {
+	switch -- $opt {
+		"--network" {
+			set network $optval
+		}
+		"-h" - "--help" {
+			puts "Usage: node \[--help\] \[--network {main|beta}\]"
+			exit 0
+		}
+		default {
+			puts stderr "Invalid option: $opt"
+			exit 1
+		}
+	}
+}
+
+# Override logging, to file
+proc ::nano::node::user_log {line} {
+	if {![info exists ::logfd]} {
+		set logfile [file join [file dirname [info script]] "node.log"]
+		set ::logfd [open $logfile a+]
+		fconfigure $::logfd -blocking false
+	}
+
+	puts $::logfd $line
+	flush $::logfd
+}
+
+::nano::node::configure $network
+::nano::node::start -bootstrap false -wait false
+::nano::node::cli -interactive

ADDED   bin/rpc-client
Index: bin/rpc-client
==================================================================
--- /dev/null
+++ bin/rpc-client
@@ -0,0 +1,41 @@
+#! /usr/bin/env tclsh
+
+package require nano
+
+## Set defaults
+set url {http://[::1]:55000/}
+
+## Process
+if {[llength $argv] % 2 != 0} {
+	lappend argv ""
+}
+foreach {opt optval} $argv {
+	switch -- $opt {
+		"--url" {
+			set url $optval
+		}
+		"-h" - "--help" {
+			puts "Usage: rpc-client \[--help\] \[--url <rpc-url>\]"
+			exit 0
+		}
+		default {
+			puts stderr "Invalid option: $opt"
+			exit 1
+		}
+	}
+}
+
+# Override logging, to file
+proc ::nano::node::user_log {line} {
+	if {![info exists ::logfd]} {
+		set ::logfd [open "node.log" a+]
+		fconfigure $::logfd -blocking false
+	}
+
+	puts $::logfd $line
+	flush $::logfd
+}
+
+
+nano::rpc::client::init -url $url
+::nano::rpc::cli -interactive

DELETED node.tcl
Index: node.tcl
==================================================================
--- node.tcl
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env tclsh
-
-package require nano
-
-# Process command-line options
-## Set defaults
-set network main
-
-## Process
-if {[llength $argv] % 2 != 0} {
-	lappend argv ""
-}
-foreach {opt optval} $argv {
-	switch -- $opt {
-		"--network" {
-			set network $optval
-		}
-		"-h" - "--help" {
-			puts "Usage: node \[--help\] \[--network {main|beta}\]"
-			exit 0
-		}
-		default {
-			puts stderr "Invalid option: $opt"
-			exit 1
-		}
-	}
-}
-
-# Override logging, to file
-proc ::nano::node::user_log {line} {
-	if {![info exists ::logfd]} {
-		set logfile [file join [file dirname [info script]] "node.log"]
-		set ::logfd [open $logfile a+]
-		fconfigure $::logfd -blocking false
-	}
-
-	puts $::logfd $line
-	flush $::logfd
-}
-
-::nano::node::configure $network
-::nano::node::start -bootstrap false -wait false
-::nano::node::cli -interactive

DELETED rpc-client.tcl
Index: rpc-client.tcl
==================================================================
--- rpc-client.tcl
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env tclsh
-
-package require nano
-
-## Set defaults
-set url {http://[::1]:55000/}
-
-## Process
-if {[llength $argv] % 2 != 0} {
-	lappend argv ""
-}
-foreach {opt optval} $argv {
-	switch -- $opt {
-		"--url" {
-			set url $optval
-		}
-		"-h" - "--help" {
-			puts "Usage: rpc-client \[--help\] \[--url <rpc-url>\]"
-			exit 0
-		}
-		default {
-			puts stderr "Invalid option: $opt"
-			exit 1
-		}
-	}
-}
-
-# Override logging, to file
-proc ::nano::node::user_log {line} {
-	if {![info exists ::logfd]} {
-		set ::logfd [open "node.log" a+]
-		fconfigure $::logfd -blocking false
-	}
-
-	puts $::logfd $line
-	flush $::logfd
-}
-
-
-nano::rpc::client::init -url $url
-::nano::rpc::cli -interactive