diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index fd4e747717e8..4fd50c4d42d7 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	KeePassX
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
diff --git a/security/keepassx/files/patch-src-mainwindow.cpp b/security/keepassx/files/patch-src-mainwindow.cpp
new file mode 100644
index 000000000000..9291974e0546
--- /dev/null
+++ b/security/keepassx/files/patch-src-mainwindow.cpp
@@ -0,0 +1,32 @@
+--- src/mainwindow.cpp.orig	Wed Jun  7 12:54:20 2006
++++ src/mainwindow.cpp	Mon Jun  4 08:56:25 2007
+@@ -879,6 +879,9 @@
+ 
+ void KeepassMainWindow::OnEditUsernameToClipboard(){
+ Clipboard->setText(currentEntry()->UserName,  QClipboard::Clipboard);
++if(Clipboard->supportsSelection()){
++ Clipboard->setText(currentEntry()->UserName,  QClipboard::Selection);
++}
+ ClipboardTimer.setSingleShot(true);
+ ClipboardTimer.start(config.ClipboardTimeOut*1000);
+ }
+@@ -886,6 +889,9 @@
+ void KeepassMainWindow::OnEditPasswordToClipboard(){
+ currentEntry()->Password.unlock();
+ Clipboard->setText(currentEntry()->Password.string(),QClipboard::Clipboard);
++if(Clipboard->supportsSelection()){
++ Clipboard->setText(currentEntry()->Password.string(),QClipboard::Selection);
++}
+ ClipboardTimer.setSingleShot(true);
+ ClipboardTimer.start(config.ClipboardTimeOut*1000);
+ currentEntry()->Password.lock();
+@@ -894,6 +900,9 @@
+ 
+ void KeepassMainWindow::OnClipboardTimeOut(){
+ Clipboard->clear(QClipboard::Clipboard);
++if(Clipboard->supportsSelection()){
++ Clipboard->clear(QClipboard::Selection);
++}
+ }
+ 
+ void KeepassMainWindow::OnEditSaveAttachment(){