diff --git a/.gitignore b/.gitignore
index e316c63..91326b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /ovirt-guest-agent-1.0.12.2.tar.bz2
 /ovirt-guest-agent-1.0.13.tar.bz2
 /ovirt-guest-agent-1.0.14.tar.bz2
+/ovirt-guest-agent-1.0.16.tar.bz2
diff --git a/ovirt-guest-agent.spec b/ovirt-guest-agent.spec
index 50a112b..2f3c95b 100644
--- a/ovirt-guest-agent.spec
+++ b/ovirt-guest-agent.spec
@@ -4,27 +4,22 @@
 
 
 %global release_version 1
-%global _moduledir /%{_lib}/security
 
-# Note this is not building any package
-# There exists no ovirt-guest-agent package
+%global _moduledir /%{_libdir}/security
+%global _kdmrc /etc/kde/kdm/kdmrc
+
 Name: ovirt-guest-agent
-Version: 1.0.14
-Release: %{release_version}%{?dist}.4
+Version: 1.0.16
+Release: %{release_version}%{?release_suffix}%{?dist}
 Summary: The oVirt Guest Agent
 License: ASL 2.0
 URL: http://wiki.ovirt.org/wiki/Category:Ovirt_guest_agent
-Source0: http://resources.ovirt.org/pub/src/ovirt-guest-agent/%{name}-%{version}.tar.bz2
+Source0: http://resources.ovirt.org/pub/src/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: libtool
 BuildRequires: pam-devel
 BuildRequires: python2-devel
-BuildRequires: python2-pep8
 BuildRequires: udev
-%if 0%{?fedora} >= 18
 BuildRequires: systemd
-%else
-BuildRequires: systemd-units
-%endif
 Requires: %{name}-common = %{version}-%{release}
 
 # The ovirt-guest-agent main package is empty.
@@ -35,29 +30,23 @@ Requires: %{name}-common = %{version}-%{release}
 %package common
 Summary: Commonly used files of the oVirt Guest Agent
 BuildArch: noarch
-Requires: python2-dbus
-Requires: pygobject2
-Requires: python2-rpm
-Requires: python2-ethtool >= 0.4-1
+BuildRequires: python-pycodestyle
+Requires: dbus-python
+Requires: rpm-python
+Requires: qemu-guest-agent
+Requires: python-ethtool >= 0.4-1
 Requires: udev >= 095-14.23
 Requires: kernel > 2.6.18-238.5.0
 Requires: usermode
 Requires: qemu-guest-agent
-%if 0%{?fedora} >= 18
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-%endif
 Provides: %{name} = %{version}-%{release}
 
 # If selinux is installed and has a version lower than tested, our package
 # would not work as expected.
-%if 0%{?fc16}
-Conflicts: selinux-policy < 3.10.0-77
-%endif
-%if 0%{?fedora} >= 17
 Conflicts: selinux-policy < 3.10.0-89
-%endif
 
 %package pam-module
 Summary: PAM module for the oVirt Guest Agent
@@ -72,7 +61,6 @@ Requires: %{name} = %{version}-%{release}
 Requires: %{name}-pam-module = %{version}-%{release}
 Requires: kdm
 
-%if 0%{?fedora} >= 20
 %package gdm-plugin
 Summary: Files for the GDM plug-in of the oVirt Guest Agent
 BuildArch: noarch
@@ -84,7 +72,6 @@ Requires: gnome-shell
 %description gdm-plugin
 Files required for the GDM extension to use the oVirt automatic log-in
 system
-%endif
 
 %description
 This is the oVirt management agent running inside the guest. The agent
@@ -122,23 +109,6 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
-cp gdm-plugin/gdm-ovirtcred.pam %{buildroot}/%{_sysconfdir}/pam.d/gdm-ovirtcred
-mkdir -p %{buildroot}%{_udevrulesdir}
-mv %{buildroot}%{_sysconfdir}/udev/rules.d/55-ovirt-guest-agent.rules %{buildroot}%{_udevrulesdir}/55-ovirt-guest-agent.rules
-sed '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{_datadir}/ovirt-guest-agent/timezone.py > %{buildroot}%{_datadir}/ovirt-guest-agent/timezone.py.new
-mv %{buildroot}%{_datadir}/ovirt-guest-agent/timezone.py{.new,}
-
-# Ensure we're elevating the guest agent diskmapper tool
-# This is done by replacing the original with a symlink to consolehelper
-# and renaming the original before hand to diskmapper.script
-# Then we install the necessary console.apps script which points to the renamed
-# original and also copy the necessary pam configuration
-cp %{buildroot}%{_sysconfdir}/security/console.apps/{ovirt-logout,diskmapper}
-cp %{buildroot}%{_sysconfdir}/pam.d/{ovirt-logout,diskmapper}
-sed -i "s/LogoutActiveUser.py/diskmapper.script/g" %{buildroot}%{_sysconfdir}/security/console.apps/diskmapper
-mv %{buildroot}%{_datadir}/ovirt-guest-agent/diskmapper{,.script}
-ln -sf /usr/bin/consolehelper %{buildroot}%{_datadir}/ovirt-guest-agent/diskmapper
-
 
 %pre common
 getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent
@@ -148,60 +118,61 @@ getent passwd ovirtagent > /dev/null || \
 exit 0
 
 %post common
+%udev_rules_update
 /sbin/udevadm trigger --subsystem-match="virtio-ports" \
     --attr-match="name=com.redhat.rhevm.vdsm"
 /sbin/udevadm trigger --subsystem-match="virtio-ports" \
     --attr-match="name=ovirt-guest-agent.0"
 
-%if 0%{?fedora} < 18
-    /bin/systemctl daemon-reload
-%else
-    # New macro for F18+
-    %systemd_post ovirt-guest-agent.service
+%if !0%{?rhel}
+%post kdm-plugin
+if ! grep -q "^PluginsLogin=" "%{_kdmrc}";
+then
+    sed -i "s~^#PluginsLogin=winbind~PluginsLogin=ovirtcred,classic~" "%{_kdmrc}"
+fi
 %endif
 
 %preun common
 if [ "$1" -eq 0 ]
 then
-    %if 0%{?fedora} < 18
-        /bin/systemctl stop ovirt-guest-agent.service > /dev/null 2>&1
-    %else
-        # New macro for F18+
-        %systemd_preun ovirt-guest-agent.service
-    %endif
-
-    # non blocking uninstalled notification
-    echo -e '{"__name__": "uninstalled"}\n' | dd \
-        of=/dev/virtio-ports/com.redhat.rhevm.vdsm \
-        oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
-
-    echo -e '{"__name__": "uninstalled"}\n' | dd \
-        of=/dev/virtio-ports/org.ovirt.vdsm \
-        oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
+    %systemd_preun ovirt-guest-agent.service
+
+    # Send an "uninstalled" notification to vdsm.
+    if [ -w /dev/virtio-ports/com.redhat.rhevm.vdsm ]
+    then
+        # Non blocking uninstalled notification
+        echo -e '{"__name__": "uninstalled"}\n' | dd \
+            of=/dev/virtio-ports/com.redhat.rhevm.vdsm \
+            oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
+    fi
+    if [ -w /dev/virtio-ports/ovirt-guest-agent.0 ]
+    then
+        # Non blocking uninstalled notification
+        echo -e '{"__name__": "uninstalled"}\n' | dd \
+            of=/dev/virtio-ports/ovirt-guest-agent.0 \
+            oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
+    fi
 fi
 
 %postun common
 if [ "$1" -eq 0 ]
 then
-    %if 0%{?fedora} < 17
-        /bin/systemctl daemon-reload
-    %endif
-
     # Let udev clear access rights
+    %udev_rules_update
     /sbin/udevadm trigger --subsystem-match="virtio-ports" \
         --attr-match="name=com.redhat.rhevm.vdsm"
     /sbin/udevadm trigger --subsystem-match="virtio-ports" \
         --attr-match="name=ovirt-guest-agent.0"
 fi
 
-%if 0%{?fedora} < 18
-    if [ "$1" -ge 1 ]; then
-        /bin/systemctl try-restart ovirt-guest-agent.service >/dev/null 2>&1 || :
-    fi
-%else
-    # New macro for F18+
-    %systemd_postun_with_restart ovirt-guest-agent.service
-%endif
+%systemd_postun_with_restart ovirt-guest-agent.service
+
+
+%postun kdm-plugin
+if [ "$1" -eq 0 ]
+then
+    sed -i "s~PluginsLogin=ovirtcred,classic~#PluginsLogin=winbind~" "%{_kdmrc}"
+fi
 
 %files common
 %dir %attr (755,ovirtagent,ovirtagent) %{_localstatedir}/log/ovirt-guest-agent
@@ -235,7 +206,7 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/ovirt-hibernate
 %config(noreplace) %{_sysconfdir}/pam.d/ovirt-flush-caches
 %config(noreplace) %{_sysconfdir}/pam.d/diskmapper
-%config(noreplace) %attr(644,root,root) %{_udevrulesdir}/55-ovirt-guest-agent.rules
+%config %attr (644,root,root) %{_sysconfdir}/udev/rules.d/55-ovirt-guest-agent.rules
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.ovirt.vdsm.Credentials.conf
 %config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-logout
 %config(noreplace) %{_sysconfdir}/security/console.apps/ovirt-locksession
@@ -251,40 +222,38 @@ fi
 %attr (755,root,root) %{_datadir}/ovirt-guest-agent/scripts/hooks/defaults/55-flush-caches.consolehelper
 %attr (755,root,root) %{_datadir}/ovirt-guest-agent/scripts/hooks/defaults/flush-caches
 
-%attr (644,root,root) %{_datadir}/ovirt-guest-agent/default.conf
-%attr (644,root,root) %{_datadir}/ovirt-guest-agent/default-logger.conf
-
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/diskmapper.script
-%{_datadir}/ovirt-guest-agent/CredServer.py*
-%{_datadir}/ovirt-guest-agent/GuestAgentLinux2.py*
 %{_datadir}/ovirt-guest-agent/OVirtAgentLogic.py*
 %{_datadir}/ovirt-guest-agent/VirtIoChannel.py*
-%{_datadir}/ovirt-guest-agent/timezone.py*
+%{_datadir}/ovirt-guest-agent/CredServer.py*
+%{_datadir}/ovirt-guest-agent/GuestAgentLinux2.py*
 %{_datadir}/ovirt-guest-agent/hooks.py*
-
-# consolehelper symlinks
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/ovirt-osinfo
-%{_datadir}/ovirt-guest-agent/diskmapper
+%{_datadir}/ovirt-guest-agent/timezone.py*
+%{_datadir}/ovirt-guest-agent/ovirt-osinfo
 %{_datadir}/ovirt-guest-agent/ovirt-logout
 %{_datadir}/ovirt-guest-agent/ovirt-flush-caches
+
+# consolehelper symlinks
 %{_datadir}/ovirt-guest-agent/ovirt-locksession
 %{_datadir}/ovirt-guest-agent/ovirt-shutdown
 %{_datadir}/ovirt-guest-agent/ovirt-hibernate
 %{_datadir}/ovirt-guest-agent/ovirt-container-list
 
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/LockActiveSession.py*
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/LogoutActiveUser.py*
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/hibernate
-%attr (755,root,root) %{_datadir}/ovirt-guest-agent/container-list
-
 # Symlinks for the default hooks
 %config(noreplace) %{_datadir}/ovirt-guest-agent/scripts/hooks/before_hibernation/55_flush-caches
 %config(noreplace) %{_datadir}/ovirt-guest-agent/scripts/hooks/before_migration/55_flush-caches
 %config(noreplace) %{_sysconfdir}/ovirt-guest-agent/hooks.d/before_hibernation/55_flush-caches
 %config(noreplace) %{_sysconfdir}/ovirt-guest-agent/hooks.d/before_migration/55_flush-caches
 
-%{_unitdir}/ovirt-guest-agent.service
+%attr (755,root,root) %{_datadir}/ovirt-guest-agent/LockActiveSession.py*
+%attr (755,root,root) %{_datadir}/ovirt-guest-agent/LogoutActiveUser.py*
+%attr (755,root,root) %{_datadir}/ovirt-guest-agent/hibernate
 
+%attr (644,root,root) %{_datadir}/ovirt-guest-agent/default.conf
+%attr (644,root,root) %{_datadir}/ovirt-guest-agent/default-logger.conf
+%attr (755,root,root) %{_datadir}/ovirt-guest-agent/diskmapper
+%attr (755,root,root) %{_datadir}/ovirt-guest-agent/container-list
+
+%{_unitdir}/ovirt-guest-agent.service
 
 %files pam-module
 %{_moduledir}/pam_ovirt_cred.so
@@ -299,6 +268,9 @@ fi
 %attr (755,root,root) %{_libdir}/kde4/kgreet_ovirtcred.so
 
 %changelog
+* Sat May 04 2019 Vinzenz Feenstra <evilissimo@redhat.com> - 1.0.16-1
+- New upstream version 1.0.16
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.14-1.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 13b1639..ec6e635 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ovirt-guest-agent-1.0.14.tar.bz2) = bcb478b26af235b0415e8fa42c69e12a5f71256921e56790408a7bb9f31b95090e2acd7bfb6276caee61e5d9a816de6b9a38a98e1c77fd2037cce72921b60aa9
+SHA512 (ovirt-guest-agent-1.0.16.tar.bz2) = d879199b8ccaa2e51db61c84c8d6e9376d48eb36a12e4718cb2e9a13f0c0d296e759dd26413e1af34129666f4996653fd654fd79148e5796a789a02e7fff9deb