diff --git a/lorax.spec b/lorax.spec
index 0b2c0361..46f1af19 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        17.0
+Version:        17.1
 Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
@@ -47,6 +47,10 @@ Requires:       kernel-bootwrapper
 %description
 Lorax is a tool for creating the anaconda install images.
 
+It also includes livemedia-creator which is used to create bootable livemedia,
+including live isos and disk images. It can use libvirtd for the install, or
+Anaconda's image install feature.
+
 %prep
 %setup -q
 
@@ -58,11 +62,12 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%doc COPYING AUTHORS README.livemedia-creator
 %{python_sitelib}/pylorax
 %{python_sitelib}/*.egg-info
 %{_sbindir}/lorax
 %{_sbindir}/mkefiboot
+%{_sbindir}/livemedia-creator
 %dir %{_sysconfdir}/lorax
 %config(noreplace) %{_sysconfdir}/lorax/lorax.conf
 %dir %{_datadir}/lorax
@@ -70,6 +75,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Fri Dec 16 2011 Brian C. Lane <bcl@redhat.com> 17.1-1
+- Add livemedia-creator and sub-packages with proper deps for virt and non-virt
+  operation.
+- Adjust a couple lorax treebuilder classes to make them callable
+
 * Mon Oct 21 2011 Will Woods <wwoods@redhat.com> 17.0-1
 - Merges the 'treebuilder' branch of lorax
 - images are split into two parts again (initrd.img, LiveOS/squashfs.img)
diff --git a/setup.py b/setup.py
index 8eadf8bd..c4141f1d 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,8 @@ for root, dnames, fnames in os.walk("share"):
                            [os.path.join(root, fname)]))
 
 # executable
-data_files.append(("/usr/sbin", ["src/sbin/lorax", "src/sbin/mkefiboot"]))
+data_files.append(("/usr/sbin", ["src/sbin/lorax", "src/sbin/mkefiboot",
+                                 "src/sbin/livemedia-creator"]))
 
 # get the version
 sys.path.insert(0, "src")