diff --git a/desktop/xfce/addon/xfce4-screensaver/actions.py b/desktop/xfce/addon/xfce4-screensaver/actions.py
index f07dd8ae1c..855ca11ff4 100644
--- a/desktop/xfce/addon/xfce4-screensaver/actions.py
+++ b/desktop/xfce/addon/xfce4-screensaver/actions.py
@@ -9,19 +9,21 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+j = ''.join([
+    '--enable-pam',
+    '--enable-locking',
+    '--enable-authentication-scheme=pam',
+    '--disable-static',
+    '--with-libgl',
+    '--with-shadow',
+    '--with-mit-ext',
+    '--with-console-kit',
+    '--with-pam-auth-type=system',
+    '--without-systemd'])
+
 def setup():
-    shelltools.system("patch -Rp1 < 0001-Catch-gs_listener_dbus_init-failures.patch")
-    autotools.configure("--enable-authentication-scheme=pam --enable-locking --enable-pam \
-    \
-    --disable-static \
-    \
-    --with-pam-auth-type=system \
-    --with-console-kit \
-    --with-mit-ext \
-    --with-shadow \
-    --with-libgl \
-    \
-    --without-systemd")
+#    shelltools.system("patch -Rp1 < 0001-Catch-gs_listener_dbus_init-failures.patch")
+    autotools.configure(j)
 
 def build():
     autotools.make()
diff --git a/desktop/xfce/addon/xfce4-screensaver/pspec.xml b/desktop/xfce/addon/xfce4-screensaver/pspec.xml
index 14c9f185c0..8c2e925be5 100644
--- a/desktop/xfce/addon/xfce4-screensaver/pspec.xml
+++ b/desktop/xfce/addon/xfce4-screensaver/pspec.xml
@@ -11,16 +11,13 @@
         <License>GPLv2</License>
         <License>LGPLv2</License>
         <License>LGPLv2.1</License>
-        <PartOf>desktop.xfce.addon</PartOf>
+        <PartOf>desktop.xfce.base</PartOf>
         <IsA>app:utility</IsA>
-        <Summary>Xfce Screensaver</Summary>
+        <Summary>Xfce Screensaver.</Summary>
         <Description>
             xfce4-screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop.
         </Description>
-        <Archive sha1sum="390fbebcd7f9be107971357f56ae86b61b41d922" type="tarbz2">https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.11.tar.bz2</Archive>
-        <AdditionalFiles>
-            <AdditionalFile target="0001-Catch-gs_listener_dbus_init-failures.patch">0001-Catch-gs_listener_dbus_init-failures.patch</AdditionalFile>
-        </AdditionalFiles>
+        <Archive sha1sum="6389b4d73ee645b888d2f6134a09a78bc2f80199" type="tarbz2">https://archive.xfce.org/src/apps/xfce4-screensaver/4.16/xfce4-screensaver-4.16.0.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>xmlto</Dependency>
             <Dependency>intltool</Dependency>
@@ -38,6 +35,9 @@
             <Dependency>libxklavier-devel</Dependency>
             <Dependency>libXScrnSaver-devel</Dependency>
         </BuildDependencies>
+        <AdditionalFiles>
+            <!-- <AdditionalFile target="0001-Catch-gs_listener_dbus_init-failures.patch">0001-Catch-gs_listener_dbus_init-failures.patch</AdditionalFile> -->
+        </AdditionalFiles>
     </Source>
 
     <Package>
@@ -74,6 +74,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2021-01-14</Date>
+            <Version>4.16.0</Version>
+            <Comment>Moved to base and version bump.</Comment>
+            <Email>wascheme@tuta.io</Email>
+            <Name>fury</Name>
+        </Update>
         <Update release="1">
             <Date>2020-12-24</Date>
             <Version>0.1.11</Version>