diff --git a/sysutils/Makefile b/sysutils/Makefile
index feb5eba50c4c..dfcf3036d8d4 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -655,6 +655,7 @@
     SUBDIR += upsmon
     SUBDIR += uptimec
     SUBDIR += uptimed
+    SUBDIR += usbhotkey
     SUBDIR += uschedule
     SUBDIR += userinfo
     SUBDIR += userlist
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
new file mode 100644
index 000000000000..2eb460abd23b
--- /dev/null
+++ b/sysutils/usbhotkey/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:   usbhotkey
+# Date created:        16 July 2007
+# Whom:                ntarmos@ceid.upatras.gr
+#
+# $FreeBSD$
+#
+
+PORTNAME=		usbhotkey
+PORTVERSION=		0.2
+CATEGORIES=		sysutils
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	usbhotkey
+
+MAINTAINER=		ntarmos@ceid.upatras.gr
+COMMENT=		A utility to remap USB keyboards under X11
+
+LIB_DEPENDS=		hid.0:${PORTSDIR}/devel/libhid \
+			Xtst.6:${PORTSDIR}/x11/libXtst
+
+OPTIONS=		GUI "Enable GUI bits (Imlib dependency)" on
+
+USE_RUBY=		yes
+USE_GMAKE=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+			LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GUI)
+LIB_DEPENDS+=		Imlib.5:${PORTSDIR}/graphics/imlib
+.else
+CONFIGURE_ARGS+=	--without-Imlib
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/usbhotkey/distinfo b/sysutils/usbhotkey/distinfo
new file mode 100644
index 000000000000..245ba3c9f0cc
--- /dev/null
+++ b/sysutils/usbhotkey/distinfo
@@ -0,0 +1,3 @@
+MD5 (usbhotkey-0.2.tar.gz) = 665583928c1bd9d422e5b514780733c5
+SHA256 (usbhotkey-0.2.tar.gz) = c5a917cbbdb664c63f4e0df84d1e4881e06289c6a2143f9c76d873936e4738e7
+SIZE (usbhotkey-0.2.tar.gz) = 197756
diff --git a/sysutils/usbhotkey/pkg-descr b/sysutils/usbhotkey/pkg-descr
new file mode 100644
index 000000000000..9755ec2017ad
--- /dev/null
+++ b/sysutils/usbhotkey/pkg-descr
@@ -0,0 +1,7 @@
+USBHotkey allows you to catch USB keyboard events (key press and release
+events) and transform them into X11 keyboard events using a ruby script.
+This provides a mechanism for creating keymaps that can be more
+complicated than the standard table-based keymap approach of X11.
+
+
+WWW: http://usbhotkey.sourceforge.net/
diff --git a/sysutils/usbhotkey/pkg-plist b/sysutils/usbhotkey/pkg-plist
new file mode 100644
index 000000000000..5d475663f14c
--- /dev/null
+++ b/sysutils/usbhotkey/pkg-plist
@@ -0,0 +1,14 @@
+share/usbhotkey-0.2/X11_keycodes.rb
+share/usbhotkey-0.2/ag5/level0.png
+share/usbhotkey-0.2/ag5/level1.png
+share/usbhotkey-0.2/ag5/level2.png
+share/usbhotkey-0.2/ag5/level3.png
+share/usbhotkey-0.2/ag5/level4.png
+share/usbhotkey-0.2/ag5/level5.png
+share/usbhotkey-0.2/ag5/level6.png
+share/usbhotkey-0.2/ag5/level7.png
+share/usbhotkey-0.2/ag5-3colors.rb
+share/usbhotkey-0.2/ag5-replicate-colours.rb
+bin/usbhotkey
+@dirrm share/usbhotkey-0.2/ag5
+@dirrm share/usbhotkey-0.2