diff --git a/.cvsignore b/.cvsignore
index 6fe4262..dfdb05c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -30,3 +30,4 @@ cobbler-0.8.0.tar.gz
 cobbler-0.8.1.tar.gz
 cobbler-0.8.2.tar.gz
 cobbler-0.8.3.tar.gz
+cobbler-1.0.0.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index f40af0a..cccaa63 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 0.8.3
-Release: 3%{?dist}
+Version: 1.0.0
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -14,7 +14,6 @@ Requires: python-devel
 Requires: createrepo
 Requires: mod_python
 Requires: python-cheetah
-Requires: rhpl
 Requires: rsync
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -41,9 +40,9 @@ 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.
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
+a Python and XMLRPC API for integration with other  
+applications.
 
 %prep
 %setup -q
@@ -84,8 +83,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/web/
 /var/www/cobbler/web/*.py*
-%dir /var/www/cgi-bin/cobbler/
-/var/www/cgi-bin/cobbler/*.cgi
+%dir /var/www/cobbler/svc/
+/var/www/cobbler/svc/*.py*
 
 %defattr(755,apache,apache)
 %dir /usr/share/cobbler/webui_templates
@@ -97,17 +96,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
-%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
-%dir /var/www/cobbler/distros
-%dir /var/www/cobbler/profiles
-%dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
@@ -121,13 +115,13 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /tftpboot/images
 %{_bindir}/cobbler
 %{_bindir}/cobblerd
-%{_bindir}/cobbler_auth_help
 %dir /etc/cobbler
 %config(noreplace) /etc/cobbler/*.ks
 %config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/users.conf
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
@@ -140,6 +134,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
+%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %dir /var/log/cobbler/syslog
 
 %defattr(755,root,root)
@@ -164,14 +159,17 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %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/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
 
 %defattr(744,root,root)
 %config(noreplace) /var/lib/cobbler/triggers/sync/post/restart-services.trigger
+%config(noreplace) /var/lib/cobbler/triggers/install/pre/status_pre.trigger
+%config(noreplace) /var/lib/cobbler/triggers/install/post/status_post.trigger
 
 %defattr(664,root,root)
-%config(noreplace) /var/lib/cobbler/settings
+%config(noreplace) /etc/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -190,6 +188,18 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-2
+- Upstream changes (see CHANGELOG)
+
+* Fri May 16 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.2-2
+- Upstream changes (see CHANGELOG)
+- moved /var/lib/cobbler/settings to /etc/cobbler/settings
+
+* Fri May 09 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.1-1
+- Upstream changes (see CHANGELOG)
+- packaged /etc/cobbler/users.conf
+- remaining CGI replaced with mod_python
+
 * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2
 - Upstream changes (see CHANGELOG)
 
diff --git a/sources b/sources
index 7eebded..98effbf 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ b5c5e3023038778bf2c7a85035a967fd  cobbler-0.8.0.tar.gz
 507e597da2dcc9eac54e86de465a7859  cobbler-0.8.1.tar.gz
 e922caf052f8d6d0e8f199a2eb81bc68  cobbler-0.8.2.tar.gz
 5b3c7d28653ddf5688b2f7a1fe793d2b  cobbler-0.8.3.tar.gz
+c699f590a0e0db40b4c557ae51f9101d  cobbler-1.0.0.tar.gz