diff --git a/etc/composer.conf b/etc/composer.conf
new file mode 100644
index 00000000..b580a388
--- /dev/null
+++ b/etc/composer.conf
@@ -0,0 +1 @@
+# lorax-composer configuration file
diff --git a/lorax.spec b/lorax.spec
index 88fe92c3..0575f6f6 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -205,6 +205,8 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
 %{python3_sitelib}/pylorax/api/*
 %{_sbindir}/lorax-composer
 %{_unitdir}/lorax-composer.service
+%dir %{_datadir}/lorax/composer
+%{_datadir}/lorax/composer/*
 
 %files -n composer-cli
 %{_bindir}/composer-cli
diff --git a/setup.py b/setup.py
index 6ae27f0c..f8ee058d 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,9 @@ import sys
 
 
 # config file
-data_files = [("/etc/lorax", ["etc/lorax.conf"])]
+data_files = [("/etc/lorax", ["etc/lorax.conf"]),
+              ("/etc/lorax", ["etc/composer.conf"]),
+              ("/usr/lib/systemd/system", ["systemd/lorax-composer.service"])]
 
 # shared files
 for root, dnames, fnames in os.walk("share"):
@@ -16,8 +18,10 @@ for root, dnames, fnames in os.walk("share"):
 
 # executable
 data_files.append(("/usr/sbin", ["src/sbin/lorax", "src/sbin/mkefiboot",
-                                 "src/sbin/livemedia-creator"]))
-data_files.append(("/usr/bin",  ["src/bin/image-minimizer", "src/bin/mk-s390-cdboot"]))
+                                 "src/sbin/livemedia-creator", "src/sbin/lorax-composer"]))
+data_files.append(("/usr/bin",  ["src/bin/image-minimizer",
+                                 "src/bin/mk-s390-cdboot",
+                                 "src/bin/composer-cli"]))
 
 # get the version
 sys.path.insert(0, "src")
@@ -34,12 +38,13 @@ finally:
 setup(name="lorax",
       version=vernum,
       description="Lorax",
-      long_description="",
+      long_description="Tools for creating bootable images, including the Anaconda boot.iso",
       author="Martin Gracik, Will Woods <wwoods@redhat.com>, Brian C. Lane <bcl@redhat.com>",
-      url="http://www.github.com/rhinstaller/lorax/",
-      download_url="http://www.github.com/rhinstaller/lorax/releases/",
+      author_email="bcl@redhat.com",
+      url="http://www.github.com/weldr/lorax/",
+      download_url="http://www.github.com/weldr/lorax/releases/",
       license="GPLv2+",
-      packages=["pylorax"],
+      packages=["pylorax", "pylorax.api", "composer", "composer.cli"],
       package_dir={"" : "src"},
       data_files=data_files
       )
diff --git a/systemd/lorax-composer.service b/systemd/lorax-composer.service
new file mode 100644
index 00000000..83365005
--- /dev/null
+++ b/systemd/lorax-composer.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lorax Image Composer API Server
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+User=root
+Type=simple
+ExecStart=/usr/sbin/lorax-composer /var/lib/lorax/composer/recipes/
+
+[Install]
+WantedBy=multi-user.target