diff --git a/ecryptfs-correct-desktop.patch b/ecryptfs-correct-desktop.patch
new file mode 100644
index 0000000..5f2075f
--- /dev/null
+++ b/ecryptfs-correct-desktop.patch
@@ -0,0 +1,13 @@
+Index: ecryptfs-utils-96/src/utils/ecryptfs-setup-private
+===================================================================
+--- ecryptfs-utils-96.orig/src/utils/ecryptfs-setup-private
++++ ecryptfs-utils-96/src/utils/ecryptfs-setup-private
+@@ -340,7 +340,7 @@ echo
+ mkdir -m 700 -p "$CRYPTDIR" || error "$(gettext 'Could not create crypt directory')" "[$CRYPTDIR]"
+ mkdir -m 700 -p "$MOUNTPOINT" || error "$(gettext 'Could not create mount directory')" "[$MOUNTPOINT]"
+ ln -sf /usr/share/ecryptfs-utils/ecryptfs-mount-private.txt "$MOUNTPOINT"/README.txt
+-ln -sf /usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop "$MOUNTPOINT"/Access-Your-Private-Data.desktop
++ln -sf /usr/share/applications/ecryptfs-mount-private.desktop "$MOUNTPOINT"/Access-Your-Private-Data.desktop
+ chmod 500 "$MOUNTPOINT"
+ 
+ # Setup ~/.ecryptfs directory
diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes
index 5f2a26f..0c2055a 100644
--- a/ecryptfs-utils.changes
+++ b/ecryptfs-utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 10 14:03:27 UTC 2012 - meissner@suse.com
+
+- point the desktop link to the right .desktop file
+- build mount.ecryptfs_private with -pie/-fpie
+
 -------------------------------------------------------------------
 Wed Jul  4 11:08:11 UTC 2012 - meissner@suse.com
 
diff --git a/ecryptfs-utils.security.patch b/ecryptfs-utils.security.patch
index cf5565f..0fcda43 100644
--- a/ecryptfs-utils.security.patch
+++ b/ecryptfs-utils.security.patch
@@ -268,3 +268,17 @@ Index: ecryptfs-utils-96/src/utils/mount.ecryptfs_private.c
  
  		/* Since we're doing a lazy unmount anyway, just unmount the current
  		 * directory. This avoids a lot of complexity in dealing with race
+Index: ecryptfs-utils-96/src/utils/Makefile.am
+===================================================================
+--- ecryptfs-utils-96.orig/src/utils/Makefile.am
++++ ecryptfs-utils-96/src/utils/Makefile.am
+@@ -58,7 +58,9 @@ ecryptfs_generate_tpm_key_CFLAGS = $(AM_
+ ecryptfs_generate_tpm_key_LDADD = $(TSPI_LIBS)
+ 
+ mount_ecryptfs_private_SOURCES = mount.ecryptfs_private.c
++mount_ecryptfs_private_CFLAGS = $(AM_CFLAGS) -fpie
+ mount_ecryptfs_private_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS)
++mount_ecryptfs_private_LDFLAGS = -pie
+ 
+ ecryptfs_stat_SOURCES = ecryptfs-stat.c
+ ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 0dbe080..0c32e31 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -27,6 +27,7 @@ Source0:        http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-
 Source1:        baselibs.conf
 Patch0:         ecryptfs-setup-swap-SuSE.patch
 Patch1:         ecryptfs-utils.security.patch
+Patch2:         ecryptfs-correct-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
@@ -52,6 +53,7 @@ A stacked cryptographic filesystem for Linux.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"