diff --git a/meta-phosphor/common/recipes-devtools/python/bottle_0.12.9.bb b/meta-phosphor/common/recipes-devtools/python/bottle_0.12.9.bb
deleted file mode 100644
index 72925e7..0000000
--- a/meta-phosphor/common/recipes-devtools/python/bottle_0.12.9.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bottle.inc
-SRC_URI = "https://pypi.python.org/packages/source/b/${BPN}/${BP}.tar.gz;name=tarball file://LICENSE file://json-format.patch"
-SRC_URI[tarball.sha256sum] = "fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051"
-SRC_URI[tarball.md5sum] = "f5850258a86224a791171e8ecbb66d99"
diff --git a/meta-phosphor/common/recipes-devtools/python/bottle.inc b/meta-phosphor/common/recipes-devtools/python/python-bottle.inc
similarity index 75%
rename from meta-phosphor/common/recipes-devtools/python/bottle.inc
rename to meta-phosphor/common/recipes-devtools/python/python-bottle.inc
index bfd5a48..d578c8b 100644
--- a/meta-phosphor/common/recipes-devtools/python/bottle.inc
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle.inc
@@ -12,7 +12,15 @@
 inherit allarch
 inherit setuptools
 
+S = "${WORKDIR}/${SRCNAME}-${PV}"
 # bottle doesn't send email...it uses a utility in here to parse rfc1123 and rfc850 timestamps.
-RDEPENDS_${PN} += "python-email"
+RDEPENDS_${PN} += "python-email-utils-standalone"
+
+PROVIDES += "${PN}-app"
+PACKAGES += "${PN}-app"
+
+SUMMARY_${PN}-app = "${SRCNAME} app"
+RDEPENDS_${PN}-app = "${PN}"
+FILES_${PN}-app = "${bindir}/bottle.py"
 
 BBCLASSEXTEND = "nativesdk"
diff --git a/meta-phosphor/common/recipes-devtools/python/bottle/LICENSE b/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/bottle/LICENSE
rename to meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE
diff --git a/meta-phosphor/common/recipes-devtools/python/bottle/json-format.patch b/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
similarity index 100%
rename from meta-phosphor/common/recipes-devtools/python/bottle/json-format.patch
rename to meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch
diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb b/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb
new file mode 100644
index 0000000..4c62045
--- /dev/null
+++ b/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.9.bb
@@ -0,0 +1,5 @@
+SRCNAME = "bottle"
+SRC_URI = "https://pypi.python.org/packages/source/b/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=tarball file://LICENSE file://json-format.patch"
+SRC_URI[tarball.sha256sum] = "fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051"
+SRC_URI[tarball.md5sum] = "f5850258a86224a791171e8ecbb66d99"
+require python-bottle.inc