diff --git a/srcpkgs/keepassx2/template b/srcpkgs/keepassx2/template
index 79a93b259b..3beeb6dd2e 100644
--- a/srcpkgs/keepassx2/template
+++ b/srcpkgs/keepassx2/template
@@ -1,14 +1,12 @@
-
 # Template file for 'keepassx2'
 _realname="keepassx"
 _realversion="2.0-beta1"
 pkgname="${_realname}2"
 version="2.0"
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config cmake"
 makedepends="qt-devel libgcrypt-devel zlib-devel"
-conflicts="keepassx>=0"
 short_desc="A password manager to secure personal data"
 maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
 license="GPL-2"
@@ -16,3 +14,13 @@ homepage="https://www.keepassx.org/"
 distfiles="${homepage}/dev/attachments/download/100/${_realname}-${_realversion}.tar.gz"
 checksum=bce1933c48fd33ef8043dd526d769fd9c454d1b63464c82a35e1f7a8689acbf2
 wrksrc="${_realname}-${_realversion}"
+
+pre_configure() {
+	sed -i CMakeLists.txt \
+		-e "s/set(PROGNAME.*/set(PROGNAME keepassx2)/"
+}
+
+post_install() {
+	sed -i $DESTDIR/usr/share/applications/keepassx2.desktop \
+		-e "s/^Exec=.*/Exec=keepassx2/"
+}