diff --git a/.cvsignore b/.cvsignore
index 50e9d9f..3d30f2d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-livecd-tools-017.tar.bz2
+livecd-tools-018.tar.bz2
diff --git a/livecd-tools.spec b/livecd-tools.spec
index f6a5ef1..ab641b8 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 017
+Version: 018
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -27,6 +27,7 @@ Requires: syslinux
 Requires: yaboot
 %endif
 BuildRequires: python
+BuildRequires: /usr/bin/pod2man
 
 
 %description 
@@ -49,12 +50,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README HACKING
+%doc AUTHORS COPYING README HACKING API
+%doc config/livecd-fedora-minimal.ks
+%{_mandir}/man*/*
 %{_bindir}/livecd-creator
 %{_bindir}/livecd-iso-to-disk
 %{_bindir}/livecd-iso-to-pxeboot
-%dir %{_datadir}/livecd-tools
-%{_datadir}/livecd-tools/*
 %{_bindir}/image-creator
 %dir %{python_sitelib}/imgcreate
 %{python_sitelib}/imgcreate/*.py
@@ -62,6 +63,24 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Thu Aug 28 2008 Jeremy Katz <katzj@redhat.com> - 018-1
+- Use logging API for debugging messages (dhuff)
+- Some initial support for booting live images on an XO
+- Refactoring of mount code for appliance-creator (danpb, dhuff)
+- Make --base-on actually work again
+- Drop the image configs; these are now in the spin-kickstarts repo
+- plymouth support
+- Listen to bootloader --append in config
+- Add man pages (Pedro Silva)
+- Support booting from Intel based Macs via EFI on USB (#450193)
+- Fixes for SELinux enforcing (eparis)
+- Eject the CD on shutdown (#239928)
+- Allow adding extra kernel args with livecd-iso-to-disk
+- Support for persistent /home (#445218)
+- Copy timezone to /etc/localtime (#445624)
+- Ensure that commands run by livecd-creator exist
+- Mount a tmpfs for some dirs (#447127)
+
 * Tue May  6 2008 Bill Nottingham <notting@redhat.com> - 017-1
 - fix F9 final configs
 
diff --git a/sources b/sources
index aaf03af..57a222a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65f37677c3e311c8b5a47a55c24e8b43  livecd-tools-017.tar.bz2
+d205dc17dd4fba75d086f374fdb2d4de  livecd-tools-018.tar.bz2