diff --git a/doc/source/conf.py b/doc/source/conf.py
index 804080e79..0bdaeb08e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -145,6 +145,8 @@ man_pages = [
      [u'OpenStack'], 1),
     ('man/nova-novncproxy', 'nova-novncproxy', u'Cloud controller fabric',
      [u'OpenStack'], 1),
+    ('man/nova-spicehtml5proxy', 'nova-spicehtml5proxy', u'Cloud controller fabric',
+     [u'OpenStack'], 1),
     ('man/nova-objectstore', 'nova-objectstore', u'Cloud controller fabric',
      [u'OpenStack'], 1),
     ('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric',
diff --git a/setup.py b/setup.py
index 12de5c4d6..78c9062c2 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ setuptools.setup(name='nova',
                'bin/nova-objectstore',
                'bin/nova-rootwrap',
                'bin/nova-scheduler',
+               'bin/nova-spicehtml5proxy',
                'bin/nova-xvpvncproxy',
               ],
         py_modules=[])