diff --git a/.cvsignore b/.cvsignore
index 3b05b8b..229302c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ cobbler-0.1.1.tar.gz
 cobbler-0.2.1.tar.gz
 cobbler-0.2.2.tar.gz
 cobbler-0.2.3.tar.gz
+cobbler-0.2.5.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 0782b41..8834b2f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.3
+Version: 0.2.5
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -28,19 +28,20 @@ last two modes require 'koan' to be run on the remote system.
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
+/etc/cobbler/*.ks
 /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
@@ -54,6 +55,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
 %changelog
+
+* Mon Oct 16 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
+- Upstream features and bugfixes (see CHANGELOG)
+- Packaged additional kickstart file and specfile cleanup
+
+* Thu Oct 12 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.4-1
+- Upstream features and bugfixes (see CHANGELOG)
+
 * Mon Oct 9 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.3-1
 - Upstream features (see CHANGELOG) & URL update
 
@@ -70,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 - Lots of new PXE and dhcpd.conf upstream, elilo.efi now included.
 
 * Thu Sep 21 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
+- Added doc files to doc, removed INSTALLED_FILES code
 
 * Wed Sep 20 2006 Michael DeHaan <mdehaan@redhat.com> - 0.1.1-7
 - Upstream updates
diff --git a/sources b/sources
index c80e057..2f0d53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90596f95025ec8180e1907cb2f768fa7  cobbler-0.2.3.tar.gz
+ac4be73942d50274648093510f119aaf  cobbler-0.2.5.tar.gz