diff --git a/CHANGELOG b/CHANGELOG
index 58558304..f93f8e82 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 3.0.1
+
+	The ponysay-tool command is now installed.
+
+
 Version 3.0
 
 	New ponies: applesplit, amira, babseed, bear, beautybrass, bigmacsleep, billneigh, cadancecrystal, cadancescruffy,
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 811b6509..f8eb042d 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -8,7 +8,7 @@
 @documentlanguage en
 @finalout
 @c %**end of header
-@set VERSION 3.0
+@set VERSION 3.0.1
 
 @defindex op
 @synindex op vr
@@ -1807,7 +1807,7 @@ Install nothing, except legal documents, that is not explicity included.
 @opindex @option{--without-ponysay}
 @opindex @option{--with-ponysay-command}
 @opindex @option{--without-ponysay-command}
-Install the ponysay command, and set file name. (Default)
+Install the @command{ponysay} command, and set file name. (Default)
 
 @item --with-ponythink
 @itemx --with-ponythink-command=/usr/bin/ponythink
@@ -1815,7 +1815,15 @@ Install the ponysay command, and set file name. (Default)
 @opindex @option{--without-ponytink}
 @opindex @option{--with-ponythink-command}
 @opindex @option{--without-ponytink-command}
-Install the ponythink command, and set file name. (Default)
+Install the @command{ponythink} command, and set file name. (Default)
+
+@item --with-ponysay-tool
+@itemx --with-ponyponysay-tool-command=/usr/bin/ponyponysay-tool
+@opindex @option{--with-ponysay-tool}
+@opindex @option{--without-ponysay-tool}
+@opindex @option{--with-ponysay-tool-command}
+@opindex @option{--without-ponysay-tool-command}
+Install the @command{ponysay-tool} command, and set file name. (Default)
 
 @item --with-shared-cache=/var/cache/ponysay
 @opindex @option{--with-shared-cache}
@@ -2955,6 +2963,13 @@ sequences.
 @cindex versions
 @cindex previous releases
 
+@heading Version 3.0.1
+@itemize @bullet
+@item
+The @command{ponysay-tool} command is now installed.
+@end itemize
+
+
 @heading Version 3.0
 @itemize @bullet
 @item
diff --git a/setup.py b/setup.py
index b5cd43b9..4c925008 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ sharedirs = [('ponies', 'xterm ponies', 'PONYDIR', True),  # must be first
 
 sharefiles = [('ucs', 'ucsmap')]
 
-commands = ['ponysay', 'ponythink']
+commands = ['ponysay', 'ponythink', 'ponysay-tool']
 
 shells = [('bash', '/usr/share/bash-completion/completions/ponysay', 'GNU Bash'),
           ('fish', '/usr/share/fish/completions/ponysay.fish', 'Friendly interactive shell'),
@@ -42,7 +42,7 @@ miscfiles = [('COPYING', '/usr/share/licenses/ponysay/COPYING'),
 ponysaysrc = [src + '.py' for src in
               ('__main__', 'common', 'ponysay', 'argparser', 'balloon',
                'backend', 'colourstack', 'ucs', 'spellocorrecter', 'kms',
-               'list', 'metadata')]
+               'list', 'metadata', 'ponysaytool')]
 
 
 
@@ -746,7 +746,7 @@ class Setup():
     def clean(self):
         print('\033[1;34m::\033[39mCleaning...\033[21m')
         
-        files = ['ponysay.info', 'ponysay.info.gz', 'ponysay.info.xz',  'ponysay.pdf.gz', 'ponysay.pdf.xz', 'ponysay.install', 'ponysay.zip']
+        files = ['ponysay.info', 'ponysay.info.gz', 'ponysay.info.xz',  'ponysay.pdf.gz', 'ponysay.pdf.xz', 'ponysay.install']
         files += ['src/%s.install' % file for file in ponysaysrc]
         dirs = ['quotes']
         for comp in ['install', 'gz', 'xz']:
@@ -773,7 +773,7 @@ class Setup():
     def cleanOld(self):
         print('\033[1;34m::\033[39mCleaning old files...\033[21m')
         
-        files = ['truncater', 'ponysaytruncater', 'ponysay.py.install', 'ponysay.install~']
+        files = ['truncater', 'ponysaytruncater', 'ponysay.py.install', 'ponysay.install~', 'ponysay.zip']
         dirs = []
         for shell in [item[0] for item in shells]:
             files.append('completion/%s-completion.%s.install' % (shell, 'sh' if shell == 'bash' else shell))
diff --git a/src/__main__.py b/src/__main__.py
index 5c611d4c..308252c0 100755
--- a/src/__main__.py
+++ b/src/__main__.py
@@ -46,11 +46,26 @@ from ponysay import *
 
 
 '''
-Start the program from ponysay.__init__ if this is the executed file
+Start the program
 '''
 if __name__ == '__main__':
-    isthink =  (len(__file__) >= len('think'))    and (__file__.endswith('think'))
-    isthink = ((len(__file__) >= len('think.py')) and (__file__.endswith('think.py'))) or isthink
+    istool = sys.argv[0]
+    if os.sep in istool:
+        istool = istool[istool.rfind(os.sep) + 1:]
+    if os.extsep in istool:
+        istool = istool[:istool.find(os.extsep)]
+    istool = istool.endswith('-tool')
+    if istool:
+        from ponysaytool import *
+        startponysaytool()
+        exit(0)
+    
+    isthink = sys.argv[0]
+    if os.sep in isthink:
+        isthink = isthink[isthink.rfind(os.sep) + 1:]
+    if os.extsep in isthink:
+        isthink = isthink[:isthink.find(os.extsep)]
+    isthink = isthink.endswith('think')
     
     usage_saythink = '\033[34;1m(ponysay | ponythink)\033[21;39m'
     usage_common   = '[-c] [-W\033[33mCOLUMN\033[39m] [-b\033[33mSTYLE\033[39m]'
diff --git a/src/ponysay-tool.py b/src/ponysaytool.py
similarity index 99%
rename from src/ponysay-tool.py
rename to src/ponysaytool.py
index f0465f4e..0fd03c79 100755
--- a/src/ponysay-tool.py
+++ b/src/ponysaytool.py
@@ -1184,9 +1184,9 @@ class TextArea(): # TODO support small screens
 
 
 '''
-Start the program from ponysay.__init__ if this is the executed file
+Start the program
 '''
-if __name__ == '__main__':
+def startponysaytool():
     '''
     The user's home directory
     '''
@@ -1252,3 +1252,7 @@ if __name__ == '__main__':
     
     PonysayTool(args = opts)
 
+
+if __name__ == '__main__':
+    startponysaytool()
+