diff --git a/src/calibre/ebooks/oeb/polish/main.py b/src/calibre/ebooks/oeb/polish/main.py
index cba24c2a07..57cf570ed4 100644
--- a/src/calibre/ebooks/oeb/polish/main.py
+++ b/src/calibre/ebooks/oeb/polish/main.py
@@ -111,7 +111,7 @@ def option_parser():
 
     return parser
 
-def cli_polish():
+def main():
     parser = option_parser()
     opts, args = parser.parse_args()
     log = Log(level=Log.DEBUG if opts.verbose else Log.INFO)
@@ -156,5 +156,5 @@ def cli_polish():
     log('Output written to:', outbook)
 
 if __name__ == '__main__':
-    cli_polish()
+    main()
 
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 0f3e2d1792..1ba7796714 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -19,6 +19,7 @@ entry_points = {
              'ebook-device       = calibre.devices.cli:main',
              'ebook-meta         = calibre.ebooks.metadata.cli:main',
              'ebook-convert      = calibre.ebooks.conversion.cli:main',
+             'ebook-polish       = calibre.ebooks.oeb.polish.main:main',
              'markdown-calibre   = calibre.ebooks.markdown.markdown:main',
              'web2disk           = calibre.web.fetch.simple:main',
              'calibre-server     = calibre.library.server.main:main',
@@ -30,7 +31,6 @@ entry_points = {
              'calibre-customize  = calibre.customize.ui:main',
              'calibre-complete   = calibre.utils.complete:main',
              'fetch-ebook-metadata = calibre.ebooks.metadata.sources.cli:main',
-             'epub-fix           = calibre.ebooks.epub.fix.main:main',
              'calibre-smtp = calibre.utils.smtp:main',
         ],
         'gui_scripts'    : [
@@ -226,7 +226,7 @@ class PostInstall:
             from calibre.gui2.main import option_parser as guiop
             from calibre.utils.smtp import option_parser as smtp_op
             from calibre.library.server.main import option_parser as serv_op
-            from calibre.ebooks.epub.fix.main import option_parser as fix_op
+            from calibre.ebooks.oeb.polish.main import option_parser as polish_op, SUPPORTED
             from calibre.ebooks import BOOK_EXTENSIONS
             input_formats = sorted(all_input_formats())
             bc = os.path.join(os.path.dirname(self.opts.staging_sharedir),
@@ -251,12 +251,12 @@ class PostInstall:
                 f.write(opts_and_exts('calibre', guiop, BOOK_EXTENSIONS))
                 f.write(opts_and_exts('lrf2lrs', lrf2lrsop, ['lrf']))
                 f.write(opts_and_exts('ebook-meta', metaop, list(meta_filetypes())))
+                f.write(opts_and_exts('ebook-polish', polish_op, [x.lower() for x in SUPPORTED]))
                 f.write(opts_and_exts('lrfviewer', lrfviewerop, ['lrf']))
                 f.write(opts_and_exts('ebook-viewer', viewer_op, input_formats))
                 f.write(opts_and_words('fetch-ebook-metadata', fem_op, []))
                 f.write(opts_and_words('calibre-smtp', smtp_op, []))
                 f.write(opts_and_words('calibre-server', serv_op, []))
-                f.write(opts_and_exts('epub-fix', fix_op, ['epub']))
                 f.write(textwrap.dedent('''
                 _ebook_device_ls()
                 {