diff --git a/docs/cli_pinout.rst b/docs/cli_tools.rst
similarity index 73%
rename from docs/cli_pinout.rst
rename to docs/cli_tools.rst
index 4f8950b..a92ec71 100644
--- a/docs/cli_pinout.rst
+++ b/docs/cli_tools.rst
@@ -11,16 +11,16 @@ tool to write details of the GPIO pins available.
 
 Unless specified, the revision of the current device will be detected. A
 particular revision may be selected with the --revision command-line
-option. *e.g.*:
+option. e.g::
 
-    pinout.py --revision 000d
+    pinout --revision 000d
 
 By default, the output will include ANSI color codes if run in a color-capable
 terminal. This behaviour may be overridden by the --color or --monochrome
-options to force colored or non-colored output, respectively. *e.g.*:
+options to force colored or non-colored output, respectively. e.g::
 
-    pinout.py --monochrome
+    pinout --monochrome
 
-Full usage details are available with:
+Full usage details are available with::
 
-    pinout.py --help
+    pinout --help
diff --git a/docs/index.rst b/docs/index.rst
index c4245c4..6ea2d2a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,7 +18,7 @@ Table of Contents
     api_tools
     api_pins
     api_exc
-    cli_pinout
+    cli_tools
     changelog
     license
 
diff --git a/gpiozero/cli/pinout.py b/gpiozero/cli/pinout.py
old mode 100644
new mode 100755
index 8e652dc..d28cc1c
--- a/gpiozero/cli/pinout.py
+++ b/gpiozero/cli/pinout.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-pinout.py - gpiozero command-line pinout tool.
+pinout - gpiozero command-line pinout tool.
 
 Output Raspberry Pi GPIO pinout information.
 """
@@ -56,7 +56,7 @@ def main():
         try:
             pi_info().pprint(color=args.color)
         except IOError:
-            print('This device is not a Raspberry Pi?')
+            print('This device is not a Raspberry Pi')
             exit(2)
     else:
         pi_info(args.revision).pprint(color=args.color)
diff --git a/setup.py b/setup.py
index a7ea6ae..6d70a29 100644
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,9 @@ __entry_points__ = {
         'MockPin    = gpiozero.pins.mock:MockPin',
         'MockPWMPin = gpiozero.pins.mock:MockPWMPin',
     ],
+    'console_scripts': [
+        'pinout = gpiozero.cli.pinout:main',
+    ]
 }