diff --git a/mount.encfs13 b/mount.encfs13
deleted file mode 100644
index d18a340..0000000
--- a/mount.encfs13
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-CMD="${0##*/}"
-
-if [[ "$CMD" =~ "umount" ]]; then
-    if [ ! -x /usr/sbin/umount.encfs13 ]; then
-        logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found."
-        exit 1
-    fi
-    /usr/sbin/umount.encfs13 "$@"
-elif [[ "$CMD" =~ "mount" ]]; then
-    if [ ! -x /usr/sbin/mount.encfs13 ]; then
-        logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found."
-        exit 1
-    fi
-    /usr/sbin/mount.encfs13 "$@"
-else
-    logger -t "mount.encfs13" -p user.err -i "Unknown command: $0"
-    exit 1
-fi
-
diff --git a/pam_mount-2.10.tar.xz b/pam_mount-2.10.tar.xz
deleted file mode 100644
index bac0b89..0000000
--- a/pam_mount-2.10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0241950ee4753e0110dba13a68b8f1dc3c059c45a253452cdb67584d60c361c
-size 284152
diff --git a/pam_mount-2.10.tar.xz.asc b/pam_mount-2.10.tar.xz.asc
deleted file mode 100644
index 16faf57..0000000
--- a/pam_mount-2.10.tar.xz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEABECAAYFAk2ob4AACgkQ92gFgoRMQ2DhiwCcCyIQvBPY2vn6H8D+GEF0eor5
-jRoAn1gGHx2D1yDiU9oul2TqqUULbqqY
-=y9rO
------END PGP SIGNATURE-----
diff --git a/pam_mount-2.11.tar.xz b/pam_mount-2.11.tar.xz
new file mode 100644
index 0000000..408131b
--- /dev/null
+++ b/pam_mount-2.11.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d
+size 283960
diff --git a/pam_mount-2.11.tar.xz.asc b/pam_mount-2.11.tar.xz.asc
new file mode 100644
index 0000000..952ffdb
--- /dev/null
+++ b/pam_mount-2.11.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EABEIAAYFAk491X0ACgkQkb3j62iiDkWT5AD9FbCohmRy/Yz7T45XDYQw69/a
+RmLWSrkE4x3b4F47/XsA/3EuH9OFL+xecizdjVqTrKn/G8j6MWtEeG+usxXNUIhf
+=PYPR
+-----END PGP SIGNATURE-----
diff --git a/pam_mount.changes b/pam_mount.changes
index 799944b..44d5e5f 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Aug  7 00:09:17 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 2.11
+* Allow specifying CIFS/NCP/NFS <volume>s without a
+  "server" attribute (this allows AD integration via pam_winbind)
+* Added a handful of diagnostics to umount.crypt to determine
+  failure to find vfsmounts
+* Use /run directory for our variadic data
+* pmt-ehd: Exclusively create LUKS partitions from now on
+
 -------------------------------------------------------------------
 Fri Apr 15 11:21:08 UTC 2011 - jengelh@medozas.de
 
diff --git a/pam_mount.spec b/pam_mount.spec
index cd024a0..34926c6 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -15,8 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           pam_mount
 BuildRequires:  perl-XML-Parser perl-XML-Writer
@@ -27,7 +25,7 @@ BuildRequires:  libcryptsetup-devel >= 1.1.2
 Requires:       device-mapper >= 1.02.48
 BuildRequires:  linux-kernel-headers >= 2.6
 Summary:        A PAM Module that can Mount Volumes for a User Session
-Version:        2.10
+Version:        2.11
 Release:        1
 # for fd0ssh and ofl:
 Suggests:       hxtools >= 20090116
@@ -38,11 +36,10 @@ License:        LGPLv2.1+
 Group:          System/Libraries
 Source:         %name-%version.tar.xz
 Source9:        %name-%version.tar.xz.asc
-BuildRequires:  xz
+BuildRequires:  man, xz
 Source1:        convert_pam_mount_conf.pl
 Source2:        convert_keyhash.pl
 Source3:        mount.crypt
-Source4:        mount.encfs13
 Source5:        baselibs.conf
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -60,7 +57,9 @@ volumes are set up properly because often they need more than just a
 mount call, such as encrypted volumes. This includes SMB/CIFS, FUSE,
 dm-crypt and LUKS.
 
-
+Author(s):
+----------
+	Jan Engelhardt
 
 %prep
 %setup -q
@@ -81,15 +80,11 @@ install -m 755 %SOURCE1 %buildroot/%_docdir/%name/examples/
 install -m 755 %SOURCE2 %buildroot/%_docdir/%name/examples/
 #
 # move /sbin/mount.crypt to %_sbindir/mount.crypt and put a wrapper script to /sbin/mount.crypt
-# The same for mount.encfs13
 #
 mkdir -p %buildroot%_sbindir/
 mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/
-mv %buildroot/sbin/mount.encfs13 %buildroot%_sbindir/
 ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt
-ln -s %_sbindir/mount.encfs13 %buildroot%_sbindir/umount.encfs13
 install -m755 %SOURCE3 %buildroot/sbin/
-install -m755 %SOURCE4 %buildroot/sbin/
 
 %post
 if [ -e etc/security/pam_mount.conf ]
@@ -116,11 +111,8 @@ fi
 /%_lib/security/pam_mount*.so
 /sbin/mount.crypt*
 /sbin/umount.crypt*
-/sbin/mount.encfs13
 %_sbindir/mount.crypt
 %_sbindir/umount.crypt
-%_sbindir/mount.encfs13
-%_sbindir/umount.encfs13
 %_sbindir/pmvarrun
 %_sbindir/pmt-ehd
 %config(noreplace) %_sysconfdir/security/pam_mount.conf.xml