diff --git a/debian/control b/debian/control
index 4bc6c710..de640018 100644
--- a/debian/control
+++ b/debian/control
@@ -217,6 +217,24 @@ Description: OpenStack Image Registry and Delivery Service - API server
  .
  This package contains the Glance API server.
 
+Package: glance-glare
+Architecture: all
+Depends: adduser,
+         glance-common (= ${source:Version}),
+         python-openstackclient (>= 2.1.0),
+         ${misc:Depends},
+         ${ostack-lsb-base},
+         ${python:Depends},
+Recommends: python-glanceclient
+Suggests: q-text-as-data
+Description: OpenStack Artifacts - API server
+ The Glance project provides services for discovering, registering, and
+ retrieving virtual machine images over the cloud. They may be stand-alone
+ services, or may be used to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This package contains the Glance Glare artifacts API server.
+
 Package: glance-registry
 Architecture: all
 Depends: adduser,
diff --git a/debian/glance-common.install b/debian/glance-common.install
index a8306b29..5a42c3b0 100644
--- a/debian/glance-common.install
+++ b/debian/glance-common.install
@@ -1,8 +1,8 @@
 etc/glance-api-paste.ini	usr/share/glance-common
+etc/glance-glare-paste.ini	usr/share/glance-common
 etc/glance-registry-paste.ini	usr/share/glance-common
 etc/policy.json			usr/share/glance-common
 etc/schema-image.json		usr/share/glance-common
 usr/bin/glance-control
 usr/bin/glance-manage
-usr/bin/glance-glare
 usr/etc/glance/metadefs		usr/share/glance-common
diff --git a/debian/glance-common.postinst.in b/debian/glance-common.postinst.in
index 52bc4e37..653360ff 100644
--- a/debian/glance-common.postinst.in
+++ b/debian/glance-common.postinst.in
@@ -37,6 +37,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	pkgos_write_new_conf glance glance-scrubber.conf
 
 	pkgos_write_new_conf glance glance-api-paste.ini
+	pkgos_write_new_conf glance glance-glare-paste.ini
 	pkgos_write_new_conf glance glance-registry-paste.ini
 	pkgos_write_new_conf glance policy.json
 	pkgos_write_new_conf glance schema-image.json
diff --git a/debian/glance-glare.init.in b/debian/glance-glare.init.in
new file mode 100644
index 00000000..b9684fd5
--- /dev/null
+++ b/debian/glance-glare.init.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          glance-glare
+# Required-Start:    $network $local_fs $remote_fs $syslog
+# Required-Stop:     $remote_fs
+# Should-Start:      postgresql mysql keystone ntp rabbitmq-server
+# Should-Stop:       postgresql mysql keystone ntp rabbitmq-server
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Glance Glare API server
+# Description:       Frontend Glance Glare API server
+### END INIT INFO
+
+DESC="OpenStack Image Service API"
+PROJECT_NAME=glance
+NAME=${PROJECT_NAME}-glare
+CONFIG_FILE=/etc/${PROJECT_NAME}/glance-glare.conf
diff --git a/debian/glance-glare.install b/debian/glance-glare.install
new file mode 100644
index 00000000..18ac263a
--- /dev/null
+++ b/debian/glance-glare.install
@@ -0,0 +1 @@
+usr/bin/glance-glare
diff --git a/debian/rules b/debian/rules
index aefa0b98..747a46cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ override_dh_install:
 	pkgos-fix-config-default $(CURDIR)/debian/glance-common/usr/share/glance-common/glance-api.conf keystone_authtoken auth_protocol http
 	pkgos-fix-config-default $(CURDIR)/debian/glance-common/usr/share/glance-common/glance-api.conf glance_store filesystem_store_datadir /var/lib/glance/images
 	pkgos-fix-config-default $(CURDIR)/debian/glance-common/usr/share/glance-common/glance-api.conf oslo_concurrency lock_path /var/lock/glance
-	# Do not percist build time CPU numbres. See https://bugs.debian.org/807475
+	# Do not persist build time CPU numbers. See https://bugs.debian.org/807475
 	sed -i 's|^[ \t#]*workers[ \t]*=[ \t].*|#workers = 2|' $(CURDIR)/debian/glance-common/usr/share/glance-common/glance-api.conf
 
 	PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
@@ -116,6 +116,7 @@ override_dh_install:
 		--namespace oslo.log \
 		--namespace oslo.policy
 	install -D -m 0664 etc/glance-swift.conf.sample $(CURDIR)/debian/glance-common/usr/share/glance-common/glance-swift.conf
+	install -D -m 0664 etc/ovf-metadata.json.sample $(CURDIR)/debian/glance-common/usr/share/glance-common/ovf-metadata.json
 	install -D -m 0664 etc/property-protections-policies.conf.sample $(CURDIR)/debian/glance-common/usr/share/glance-common/property-protections-policies.conf
 	install -D -m 0664 etc/property-protections-roles.conf.sample $(CURDIR)/debian/glance-common/usr/share/glance-common/property-protections-roles.conf