diff --git a/xscreensaver/LICENSE b/xscreensaver/LICENSE
new file mode 100644
index 000000000..4f587b5a3
--- /dev/null
+++ b/xscreensaver/LICENSE
@@ -0,0 +1,9 @@
+/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */
diff --git a/xscreensaver/PKGBUILD b/xscreensaver/PKGBUILD
new file mode 100644
index 000000000..4f618180d
--- /dev/null
+++ b/xscreensaver/PKGBUILD
@@ -0,0 +1,43 @@
+#
+# Desktop Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas@chakra-project.org
+
+pkgname=xscreensaver
+pkgver=5.19
+pkgrel=1
+pkgdesc="Screen saver and locker for the X Window System"
+arch=('i686' 'x86_64')
+url="http://www.jwz.org/xscreensaver/"
+license=('BSD')
+depends=('libxxf86misc' 'mesa' 'pam' 'xorg-res-utils' 'libxmu' 'libjpeg-turbo' 'libglade')
+makedepends=('bc' 'libxpm')
+backup=('etc/pam.d/xscreensaver')
+source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz
+        add-electricsheep.diff
+        xscreensaver.pam
+        LICENSE)
+sha1sums=('16437d45f568ded8721a917e082f9b4d948954ec'
+          'e413b1ceae40233fb543bf30d3cdbc23cabaa3b1'
+          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+          '4209ea586b204fd1d81c382a0522c654f9fd9134')
+
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/add-electricsheep.diff" 
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
+    --with-pam --without-motif --with-gtk --with-gl \
+    --without-gle --with-xpm --with-jpeg 
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install_prefix="${pkgdir}" install 
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" 
+  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" 
+  chmod 755 "${pkgdir}/usr/bin/xscreensaver" 
+  echo "NotShowIn=KDE;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" 
+}
diff --git a/xscreensaver/add-electricsheep.diff b/xscreensaver/add-electricsheep.diff
new file mode 100644
index 000000000..c2a45cf48
--- /dev/null
+++ b/xscreensaver/add-electricsheep.diff
@@ -0,0 +1,17 @@
+--- driver/XScreenSaver.ad.in.orig	2011-09-28 06:54:58.000000000 -0400
++++ driver/XScreenSaver.ad.in	2012-04-25 22:35:51.220801339 -0400
+@@ -350,12 +350,12 @@
+ @GL_KLUDGE@ GL: 				hypnowheel -root			    \n\
+ @GL_KLUDGE@ GL: 				klein -root				    \n\
+ -				lcdscrub -root				    \n\
+-@GL_KLUDGE@ GL: 				photopile -root				    \n\
+-@GL_KLUDGE@ GL: 				skytentacles -root			    \n\
+ @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
+ @GL_KLUDGE@ GL: 				companioncube -root			    \n\
+ @GL_KLUDGE@ GL: 				hilbert -root				    \n\
+ @GL_KLUDGE@ GL: 				tronbit -root				    \n
++@GL_KLUDGE@ GL: 				tronbit -root				    \n\
++			electricsheep --root 1				    \n
+ 
+ 
+ 
diff --git a/xscreensaver/xscreensaver.pam b/xscreensaver/xscreensaver.pam
new file mode 100644
index 000000000..b4d80c21f
--- /dev/null
+++ b/xscreensaver/xscreensaver.pam
@@ -0,0 +1 @@
+auth		required	pam_unix_auth.so