diff --git a/.gitignore b/.gitignore
index 10d71cc..915c9f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /fleet-commander-admin-0.7.5.tar.xz
 /fleet-commander-admin-0.7.6.tar.xz
 /fleet-commander-admin-0.7.7.tar.xz
+/fleet-commander-admin-0.8.0.tar.xz
diff --git a/fleet-commander-admin.spec b/fleet-commander-admin.spec
index 4a6b634..2d65542 100644
--- a/fleet-commander-admin.spec
+++ b/fleet-commander-admin.spec
@@ -1,13 +1,11 @@
 Name:           fleet-commander-admin
-Version:        0.7.7
+Version:        0.8.0
 Release:        1%{?dist}
 Summary:        Fleet Commander
 
 BuildArch: noarch
 
-# Fleet commander code is LGPLv2. spice-html5 uses dual license (GPLv3 or LGPLv3)
-# Bootstrap and jQuery are MIT licensed and Patternfly is MIT, ASL 2.0 and OFL
-License: LGPLv2+ and MIT and BSD and ASL 2.0 and OFL
+License: LGPLv3+ and LGPLv2+ and MIT and BSD
 URL: https://raw.githubusercontent.com/fleet-commander/fc-admin/master/fleet-commander-admin.spec
 Source0: https://github.com/fleet-commander/fc-admin/releases/download/%{version}/%{name}-%{version}.tar.xz
 
@@ -15,29 +13,38 @@ BuildRequires: python2-devel
 BuildRequires: dbus-python
 BuildRequires: pygobject2
 BuildRequires: libvirt-python
-BuildRequires: python-websockify
-BuildRequires: numpy
-BuildRequires: python-crypto
 BuildRequires: python-dbusmock
 BuildRequires: gjs
 BuildRequires: dconf
 BuildRequires: desktop-file-utils
-
+%if 0%{?rhel} < 8
+BuildRequires: pexpect
+BuildRequires: pygobject3
+%endif
+%if 0%{?fedora} >= 21
+BuildRequires: python2-pexpect
+BuildRequires: python-gobject
+%endif
+
+Requires: NetworkManager
+Requires: NetworkManager-libnm
 Requires: systemd
 Requires: dconf
 Requires: python2
 Requires: dbus-python
 Requires: pygobject2
 Requires: libvirt-python
-Requires: python-websockify
-Requires: python-crypto
-Requires: numpy
-Requires: httpd
-Requires: mod_wsgi
+Requires: cockpit
 Requires(preun): systemd
+%if 0%{?rhel} < 8
+Requires: pexpect
+Requires: pygobject3
+%endif
+%if 0%{?fedora} >= 21
+Requires: python2-pexpect
+Requires: python-gobject
+%endif
 
-Provides: bundled(jquery) = 1.11.1
-Provides: bundled(patternfly)
 Provides: bundled(spice-html5)
 
 %description
@@ -46,6 +53,7 @@ configuration of a large network of users and workstations/laptops.
 
 %package -n fleet-commander-logger
 Summary: Logs configuration changes in a session
+License: GPLv2
 Requires: gjs
 Requires: libsoup
 Requires: json-glib
@@ -69,36 +77,38 @@ desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/fleet-commander-
 %make_install
 install -m 755 -d %{buildroot}/%{_localstatedir}/lib/fleet-commander-admin/profiles
 
-%pre
-getent passwd fleet-commander-admin >/dev/null || /usr/sbin/useradd -M -r -d %{_localstatedir}/lib/fleet-commander-admin -s /usr/bin/false -c "Fleet Commander administration interface service" fleet-commander-admin
-
 %preun
 %systemd_preun fleet-commander-admin.service
-%systemd_preun fleet-commander-dbus.service
+
+%post
+%systemd_post fleet-commander-admin.service
+
+%postun
+%systemd_postun_with_restart fleet-commander-admin.service
 
 %files
 %license
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/appdata
 %dir %{_datadir}/%{name}/python
 %dir %{_datadir}/%{name}/python/fleetcommander
-%{_datadir}/%{name}/appdata
+%{_datadir}/cockpit/fleet-commander-admin
+%{_datadir}/%{name}/fc-goa-providers.ini
 %attr(644, -, -) %{_datadir}/%{name}/python/fleetcommander/*.py
 %attr(644, -, -) %{_datadir}/%{name}/python/fleetcommander/*.py[co]
 %config(noreplace) %{_sysconfdir}/xdg/%{name}.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.FleetCommander.conf
-%{_unitdir}/fleet-commander-dbus.service
+%{_unitdir}/fleet-commander-admin.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.FleetCommander.service
-%attr(-, fleet-commander-admin, -) %{_localstatedir}/lib/%{name}
-%attr(755, -, -) %{_prefix}/bin/fleet-commander-standalone
-%config(noreplace) %{_sysconfdir}/xdg/fleet-commander-apache.conf
-%attr(755, -, -) %{_libexecdir}/admin.wsgi
+%{_localstatedir}/lib/%{name}
 
 %files -n fleet-commander-logger
 %attr(755, root, root) %{_libexecdir}/fleet_commander_logger.js
 %{_sysconfdir}/xdg/autostart/fleet-commander-logger.desktop
 
 %changelog
+* Fri Sep 16 2016 Oliver Gutierrez <ogutierrez@redhat.com> - 0.8.0-1
+- Updated package for 0.8.0 release
+
 * Thu Jun 30 2016 Oliver Gutierrez <ogutierrez@redhat.com> - 0.7.7-1
 - Bugfix for spice port detection on VMs with autoport disabled
 
diff --git a/sources b/sources
index ad2bd1b..7102588 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-084573f56707f77e68da76e5d1e9d75a  fleet-commander-admin-0.7.7.tar.xz
+a3fb1fd35143925fef18a4c59d33b364  fleet-commander-admin-0.8.0.tar.xz