diff --git a/.gitignore b/.gitignore
index d746cc8..2f4e159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ sipwitch-0.9.0.tar.gz
 /sipwitch-1.8.6.tar.gz
 /sipwitch-1.8.7.tar.gz
 /sipwitch-1.9.0.tar.gz
+/sipwitch-1.9.1.tar.gz
diff --git a/sipwitch.spec b/sipwitch.spec
index 02c0a45..f8695f9 100644
--- a/sipwitch.spec
+++ b/sipwitch.spec
@@ -12,51 +12,51 @@
 
 Name: sipwitch
 Summary: A secure peer-to-peer VoIP server for the SIP protocol
-Version: 1.9.0
+Version: 1.9.1
 Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/sipwitch
 Group: Applications/Communications
 Source: http://dev.gnutelephony.org/dist/tarballs/sipwitch-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ucommon-devel >= 6.0.0
 BuildRequires: libeXosip2-devel >= 3.0.0
 BuildRequires: avahi-devel
 BuildRequires: openssl-devel
+BuildRequires: cmake
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-Requires: %{name}-runtime = %{version}-%{release}
+Requires: %{name}-runtime%{?_isa} = %{version}-%{release}
 
 %package runtime
 Group: Development/Libraries
 Summary: Runtime library support for sipwitch
 
 %package devel
-Requires: ucommon-devel >= 6.0.0
-Requires: %{name}-runtime = %{version}-%{release}
+Requires: ucommon-devel%{?_isa} >= 6.0.0
+Requires: %{name}-runtime%{?_isa} = %{version}-%{release}
 Group: Development/Libraries
 Summary: Headers for building sipwitch plugins
 
 %package cgi
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Group: Applications/CGI
 Summary: cgi web interface to control sipwitch server
 
 %package plugin-zeroconf
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Zeroconf plugin for sipwitch
 
 %package plugin-scripting
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Scripting plugin for sipwitch
 
 %package plugin-forward
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Forward registration and routing plugin
 
 %package plugin-subscriber
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Subscriber gateway plugin for sipwitch
 
 %description
@@ -113,22 +113,24 @@ remote voip service provider.
 %setup -q
 
 %build
-%configure --with-pkg-config --disable-static --with-initrddir=none
+%cmake \
+      -DSYSCONFDIR=%{_sysconfdir} \
+      -DINSTALL_MANDIR=%{_mandir} \
+      -DINSTALL_INCLUDEDIR=%{_includedir} \
+      -DINSTALL_BINDIR=%{_bindir} \
+      -DINSTALL_SBINDIR=%{_sbindir} \
+      -DINSTALL_LIBEXEC=%{_libexecdir} \
+      -DINSTALL_LIBDIR=%{_libdir} \
+	  -DINSTALL_CGIBIN=/var/www/cgi-bin \
+      -DSYSTEM_CONFIG:BOOL=TRUE \
+      .
 
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -f %{buildroot}/%{_libdir}/sipwitch/*.la
-echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
-
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc README COPYING NEWS FEATURES SUPPORT TODO NOTES AUTHORS MODULES ChangeLog
 %{_mandir}/man1/sipwitch.1*
 %{_mandir}/man1/sippasswd.1*
@@ -140,46 +142,36 @@ echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
 %attr(04755,root,root) %{_bindir}/sippasswd
 %dir %{_libdir}/sipwitch
 %config(noreplace) %{_sysconfdir}/logrotate.d/sipwitch
-%attr(0755,root,root) %{_prefix}/lib/systemd/system/sipwitch.service
+%attr(0644,root,root) %{_unitdir}/sipwitch.service
 %attr(0755,root,root) %{_sysconfdir}/cron.hourly/sipwitch
-%attr(0770,root,root) %dir %{_sysconfdir}/sipwitch.d
-%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.conf
-%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/sipwitch
-%attr(0660,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.d/*.xml*
+%attr(0775,root,root) %dir %{_sysconfdir}/sipwitch.d
+%attr(0664,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.conf
+%attr(0664,root,root) %config(noreplace) %{_sysconfdir}/default/sipwitch
+%attr(0664,root,root) %config(noreplace) %{_sysconfdir}/sipwitch.d/*.xml*
 
 %files cgi
-%defattr(-,root,root,-)
-%{_mandir}/man8/sipwitch-cgi.8*
-%{_bindir}/sipwitch-cgi
-%{_libdir}/cgi-bin/sipwitch
+%{_mandir}/man8/sipwitch.cgi.8*
+/var/www/cgi-bin/sipwitch.cgi
 
 %files runtime
-%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 
 %files plugin-zeroconf
-%defattr(-,root,root,-)
 %{_libdir}/sipwitch/zeroconf.so
 
 %files plugin-forward
-%defattr(-,root,root,-)
 %{_libdir}/sipwitch/forward.so
 
 %files plugin-scripting
-%defattr(-,root,root,-)
 %{_libdir}/sipwitch/scripting.so
 
 %files plugin-subscriber
-%defattr(-,root,root,-)
 %{_libdir}/sipwitch/subscriber.so
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_includedir}/sipwitch/
 %{_libdir}/pkgconfig/*.pc
-%{_bindir}/sipwitch-config
-%{_mandir}/man1/sipwitch-config.*
 
 %post runtime
 /sbin/ldconfig
@@ -197,6 +189,13 @@ echo "PLUGINS=auto" >>%{buildroot}/%{_sysconfdir}/sysconfig/sipwitch
 %systemd_postun_with_restart sipwitch.service
 
 %changelog
+* Sat May 03 2014 David Sugar <dyfet@gnutelephony.org> - 1.9.1-1
+- Using cmake for package build
+- Added setgroups to squash permission bleed
+- Cleaned up systemd unit; removed obsolete syslog.target
+- New upstream with complete cmake package build support
+- Removed obsolete config scripts upstream
+
 * Mon Mar 10 2014 David Sugar <dyfet@gnutelephony.org> - 1.9.0-1
 - Now operates as a systemd notify daemon service
 
diff --git a/sources b/sources
index 60b37d6..94c00c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9813083c7cbd473cab740672185b41f2  sipwitch-1.9.0.tar.gz
+d36765431cb435db8e2f46e2d2a3993a  sipwitch-1.9.1.tar.gz