diff --git a/deskutils/Makefile b/deskutils/Makefile
index 2aaa265369b5..75a09eaebcd4 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -80,6 +80,7 @@
     SUBDIR += kdepim3
     SUBDIR += kdissert
     SUBDIR += kickpim
+    SUBDIR += klipoquery
     SUBDIR += kluje
     SUBDIR += knowit
     SUBDIR += kompose
diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile
new file mode 100644
index 000000000000..367c94cf22a8
--- /dev/null
+++ b/deskutils/klipoquery/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	klipoquery
+# Date created:				Wed Jun 29 12:30:12 CEST 2005
+# Whom:					Markus Brueffer <markus@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	klipoquery
+PORTVERSION=	0.2.4
+CATEGORIES=	deskutils kde
+MASTER_SITES=	http://www.michael-vonrueden.de/${PORTNAME}/
+
+MAINTAINER=	markus@FreeBSD.org
+COMMENT=	Panel applet for web searches using clipboard entries
+
+EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+
+USE_KDELIBS_VER=3
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+
+.include <bsd.port.mk>
diff --git a/deskutils/klipoquery/distinfo b/deskutils/klipoquery/distinfo
new file mode 100644
index 000000000000..aa6f7fa78987
--- /dev/null
+++ b/deskutils/klipoquery/distinfo
@@ -0,0 +1,2 @@
+MD5 (klipoquery-0.2.4.tar.gz) = e2866389931925b81eb1f907cc7ff6d4
+SIZE (klipoquery-0.2.4.tar.gz) = 627430
diff --git a/deskutils/klipoquery/pkg-descr b/deskutils/klipoquery/pkg-descr
new file mode 100644
index 000000000000..22e2cab5fc2b
--- /dev/null
+++ b/deskutils/klipoquery/pkg-descr
@@ -0,0 +1,11 @@
+The KlipOQuery panel applet for KDE is meant to be a bridge between klipper
+and the web. By simply copying the active item from the clipboard, KlipOQuery
+will pass this string to the selected service from the popupmenu.
+ 
+Features:
+  - Get infos from selected words of all applications with one click
+  - Group services in your own categories
+  - Change selected services with the scrollwheel
+  - Have a fast access to your top services
+
+WWW: http://www.michael-vonrueden.de/klipoquery/
diff --git a/deskutils/klipoquery/pkg-plist b/deskutils/klipoquery/pkg-plist
new file mode 100644
index 000000000000..89d75742dfcb
--- /dev/null
+++ b/deskutils/klipoquery/pkg-plist
@@ -0,0 +1,14 @@
+lib/libklipoquery.la
+lib/libklipoquery.so
+share/apps/kicker/applets/klipoquery.desktop
+share/config/klipoqueryrc
+share/doc/HTML/en/klipoquery/common
+share/doc/HTML/en/klipoquery/index.cache.bz2
+share/doc/HTML/en/klipoquery/index.docbook
+@dirrm share/doc/HTML/en/klipoquery
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@unexec rmdir %D/share/config 2>/dev/null || true
+@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
+@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true