diff --git a/.cvsignore b/.cvsignore
index 3eebe56..36f172d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -20,3 +20,4 @@ cobbler-0.4.5.tar.gz
 cobbler-0.4.6.tar.gz
 cobbler-0.4.7.tar.gz
 cobbler-0.4.8.tar.gz
+cobbler-0.6.0.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 38049fb..36aa113 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.4.8
+Version: 0.6.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,10 @@ Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
 Requires: yum-utils
+Requires: rhpl
+%ifarch i386 i686 x86_64
+Requires: syslinux
+%endif
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -25,15 +29,16 @@ Url: http://cobbler.et.redhat.com
 
 %description
 
-Cobbler is a command line tool for configuration of network
-boot and update servers.  It is also available as a Python
-library.  Cobbler supports PXE, provisioning virtualized images,
-and reinstalling machines that are already running (over SSH).
-The last two modes require a helper tool called 'koan' that
-integrates with cobbler.  Cobbler's advanced features include
-importing distributions from rsync mirrors, kickstart templating,
-integrated yum mirroring, kickstart monitoring, and auto-managing
-dhcpd.conf.
+Cobbler is a network boot and update server.  Cobbler 
+supports PXE, provisioning virtualized images, and 
+reinstalling existing Linux machines.  The last two 
+modes require a helper tool called 'koan' that 
+integrates with cobbler.  Cobbler's advanced features 
+include importing distributions from DVDs and rsync 
+mirrors, kickstart templating, integrated yum 
+mirroring, and built-in DHCP Management.  Cobbler has 
+a Python API for integration with other GPL systems 
+management applications.
 
 %prep
 %setup -q
@@ -64,7 +69,9 @@ fi
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2755,apache,apache)
+%defattr(2744,apache,apache)
+/var/www/cgi-bin/findks.cgi
+/var/www/cgi-bin/nopxe.cgi
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -90,11 +97,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/cobbler/kickstart_fc6.ks
 %config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks
 %config(noreplace) /etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/dnsmasq.template
 %config(noreplace) /etc/cobbler/pxedefault.template
 %config(noreplace) /etc/cobbler/pxeprofile.template
 %config(noreplace) /etc/cobbler/pxesystem.template
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
+%config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -105,14 +114,24 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/log/cobbler/syslog
 %defattr(2550,root,root)
 %dir /var/lib/cobbler
-%dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/profile
-%dir /var/lib/cobbler/triggers/add/system
-%dir /var/lib/cobbler/triggers/add/repo
-%dir /var/lib/cobbler/triggers/delete/distro
-%dir /var/lib/cobbler/triggers/delete/profile
-%dir /var/lib/cobbler/triggers/delete/system
-%dir /var/lib/cobbler/triggers/delete/repo
+%dir /var/lib/cobbler/triggers/add/distro/pre
+%dir /var/lib/cobbler/triggers/add/distro/post
+%dir /var/lib/cobbler/triggers/add/profile/pre
+%dir /var/lib/cobbler/triggers/add/profile/post
+%dir /var/lib/cobbler/triggers/add/system/pre
+%dir /var/lib/cobbler/triggers/add/system/post
+%dir /var/lib/cobbler/triggers/add/repo/pre
+%dir /var/lib/cobbler/triggers/add/repo/post
+%dir /var/lib/cobbler/triggers/delete/distro/pre
+%dir /var/lib/cobbler/triggers/delete/distro/post
+%dir /var/lib/cobbler/triggers/delete/profile/pre
+%dir /var/lib/cobbler/triggers/delete/profile/post
+%dir /var/lib/cobbler/triggers/delete/system/pre
+%dir /var/lib/cobbler/triggers/delete/system/post
+%dir /var/lib/cobbler/triggers/delete/repo/pre
+%dir /var/lib/cobbler/triggers/delete/repo/post
+%dir /var/lib/cobbler/snippets/
+%config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
 %defattr(-,root,root)
@@ -121,6 +140,26 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Aug 09 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.0-1
+- Upstream changes (see CHANGELOG)
+
+* Thu Jul 26 2007 Michael DeHaan <mdehaan@redhat.com> - 0.5.2-1
+- Upstream changes (see CHANGELOG)
+- Tweaked description
+
+* Fri Jul 20 2007 Michael DeHaan <mdehaan@redhat.com> - 0.5.1-1
+- Upstream changes (see CHANGELOG)
+- Modified description
+- Added logrotate script
+- Added findks.cgi
+
+* Wed Jun 27 2007 Michael DeHaan <mdehaan@redhat.com> - 0.5.0-1
+- Upstream changes (see CHANGELOG)
+- Added dnsmasq.template 
+
+* Fri Apr 27 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.9-1
+- Upstream changes (see CHANGELOG)
+
 * Thu Apr 26 2007 Michael DeHaan <mdehaan@redhat.com> - 0.4.8-1
 - Upstream changes (see CHANGELOG)
 - Fix defattr in spec file
diff --git a/sources b/sources
index a424e7e..7acd397 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ad54870ccd46540a3f357a2432e668d  cobbler-0.4.8.tar.gz
+ef8006f286a4835237623d9d34a96e74  cobbler-0.6.0.tar.gz