diff --git a/.cvsignore b/.cvsignore
index 164f548..b072e45 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -27,3 +27,4 @@ cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
 cobbler-0.6.2.tar.gz
+cobbler-0.6.3.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 6a17d5a..91e204b 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.6.2
+Version: 0.6.3
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -13,7 +13,6 @@ Requires: python-devel
 Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
-Requires: yum-utils
 Requires: rhpl
 %ifarch i386 i686 x86_64
 Requires: syslinux
@@ -53,7 +52,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %post
+cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+/usr/bin/cobbler reserialize
 /sbin/chkconfig --add cobblerd
+/sbin/service cobblerd condrestart
 
 
 %preun
@@ -77,6 +82,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 /var/www/cgi-bin/cobbler/findks.cgi
 /var/www/cgi-bin/cobbler/nopxe.cgi
 /var/www/cgi-bin/cobbler/webui.cgi
+%defattr(660,apache,apache)
+%config(noreplace) /var/www/cgi-bin/cobbler/.htaccess
+%config(noreplace) /var/www/cgi-bin/cobbler/.htpasswd
 
 %defattr(755,apache,apache)
 %dir /usr/share/cobbler/webui_templates
@@ -91,6 +99,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/www/cobbler/kickstarts
 %dir /var/www/cobbler/kickstarts_sys
 %dir /var/www/cobbler/repo_mirror
+%dir /var/www/cobbler/repos_profile
+%dir /var/www/cobbler/repos_system
 %dir /var/www/cobbler/ks_mirror
 %dir /var/www/cobbler/ks_mirror/config
 %dir /var/www/cobbler/images
@@ -102,6 +112,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/www/cobbler/webui
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.js
 /var/www/cobbler/webui/*.png
 /var/www/cobbler/webui/*.html
 %defattr(-,root,root)
@@ -140,6 +151,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %defattr(755,root,root)
 %dir /var/lib/cobbler
 %dir /var/lib/cobbler/kickstarts/
+%dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -156,13 +168,19 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %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/triggers/sync/pre
+%dir /var/lib/cobbler/triggers/sync/post
 %dir /var/lib/cobbler/snippets/
 
+%defattr(744,root,root)
+%config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger
+
 %defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
+%defattr(660,root,root)
 %config(noreplace) /etc/cobbler/auth.conf 
 
 %defattr(664,root,root)
@@ -174,6 +192,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Wed Nov 07 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.3-2
+- Upstream changes (see CHANGELOG)
+- now packaging javascript file(s) seperately for WUI
+- backup state files on upgrade 
+- cobbler sync now has pre/post triggers, so package those dirs/files
+- WebUI now has .htaccess file
+- removed yum-utils as a requirement
+
 * Fri Sep 28 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.2-2
 - Upstream changes (see CHANGELOG)
 - removed syslinux as a requirement (cobbler check will detect absense)
diff --git a/sources b/sources
index ea2660f..76f3c25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
 4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz
+c42f441a486a8626ff2b26b3567b37af  cobbler-0.6.3.tar.gz