diff --git a/.cvsignore b/.cvsignore
index d13d359..1b5a566 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -48,3 +48,4 @@ cobbler-1.4.0.tar.gz
 cobbler-1.4.1.tar.gz
 cobbler-1.4.2.tar.gz
 cobbler-1.4.3.tar.gz
+cobbler-1.6.1.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 171adf0..ee08ec5 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -3,8 +3,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.3
-Release: 4%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -22,8 +22,10 @@ Requires: python-devel
 Requires: createrepo
 Requires: python-cheetah
 Requires: rsync
-BuildRequires: PyYAML
+Requires: python-netaddr
 Requires: PyYAML
+Requires: python-simplejson
+BuildRequires: PyYAML
 Requires: libyaml
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
@@ -117,7 +119,7 @@ done
 %preun
 if [ $1 = 0 ]; then
     /sbin/service cobblerd stop >/dev/null 2>&1 || :
-    chkconfig --del cobblerd
+    chkconfig --del cobblerd || :
 fi
 
 %postun
@@ -161,8 +163,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/anamon
+/var/www/cobbler/aux/anamon.init
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -171,10 +176,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %defattr(-,root,root)
 %dir /etc/cobbler
+%dir /etc/cobbler/pxe
+%dir /etc/cobbler/reporting
+%dir /etc/cobbler/power
 %config(noreplace) /var/lib/cobbler/kickstarts/*.ks
 %config(noreplace) /var/lib/cobbler/kickstarts/*.seed
 %config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/pxe/*.template
+%config(noreplace) /etc/cobbler/reporting/*.template
 %config(noreplace) /etc/cobbler/power/*.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
@@ -211,6 +220,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/backup/
 %dir /var/lib/cobbler/triggers
+%dir /var/lib/cobbler/triggers/change
 %dir /var/lib/cobbler/triggers/add
 %dir /var/lib/cobbler/triggers/add/distro
 %dir /var/lib/cobbler/triggers/add/distro/pre
@@ -245,11 +255,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %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) /etc/cobbler/settings
 /var/lib/cobbler/version
@@ -264,10 +269,18 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_anamon
+%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
+%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
+%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
+%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
 /var/lib/cobbler/yaboot-1.3.14
+/var/lib/cobbler/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -283,12 +296,16 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Fri Mar 27 2009 Michael DeHaan <mdehaan@redhat.com> - 1.6.1-1
+- Upstream changes (see CHANGELOG)
+
 * Fri Mar 06 2009 Michael DeHaan <mdehaan@redhat.com> - 1.4.3-4
 - Upstream changes (see CHANGELOG)
 - Now requires PyYAML
 
 * Thu Feb 12 2009 Michael DeHaan <mdehaan@redhat.com> - 1.4.2-1
 - Upstream changes (see CHANGELOG)
+- Adding build_report.trigger
 
 * Mon Jan 09 2009 Michael DeHaan <mdehaan@redhat.com> - 1.4.1-1
 - Upstream changes (see CHANGELOG)
diff --git a/sources b/sources
index f109489..45c52bf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d560692f78ca9b60d25c7ef79633fc5e  cobbler-1.4.3.tar.gz
+41cd0b61d1c148e953b879abe722b419  cobbler-1.6.1.tar.gz