diff --git a/x11/Makefile b/x11/Makefile
index cc15a0ab83cc..1e580d6e5234 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += xfedor
     SUBDIR += xfishtank
     SUBDIR += xgrab
+    SUBDIR += xkbctrl
     SUBDIR += xkeycaps
     SUBDIR += xkeywrap
     SUBDIR += xloadimage
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
new file mode 100644
index 000000000000..ef1584cd018f
--- /dev/null
+++ b/x11/xkbctrl/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	xkbctrl
+# Version required:	1.0
+# Date created:		9 January 2000
+# Whom:			Yoshiro MIHIRA <sanpei@sanpei.org>
+#
+# $FreeBSD$
+#
+
+DISTNAME=	xkbctrl
+PKGNAME=	xkbctrl-1.0
+CATEGORIES=	x11
+MASTER_SITES=	ftp://core.ring.gr.jp/pub/X/opengroup/unsupported/test/Xkb/programs/ \
+		ftp://ring.nacsis.ac.jp/pub/X/opengroup/unsupported/test/Xkb/programs/
+DISTFILES=	Imakefile xkbctrl.c
+
+MAINTAINER=	sanpei@sanpei.org
+
+DIST_SUBDIR=	xkbctrl
+USE_IMAKE=	yes
+NO_WRKSUBDIR=	yes
+
+do-extract:
+		@${RM} -rf ${WRKDIR}
+		@${MKDIR} ${WRKDIR}
+		@for file in ${DISTFILES}; do \
+			${CP} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${WRKSRC}; \
+		done
+
+do-install:
+		@${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/x11/xkbctrl/distinfo b/x11/xkbctrl/distinfo
new file mode 100644
index 000000000000..40a3a0edf2b2
--- /dev/null
+++ b/x11/xkbctrl/distinfo
@@ -0,0 +1,2 @@
+MD5 (xkbctrl/Imakefile) = 12125739f5bbbaaa43bcecd161fe580d
+MD5 (xkbctrl/xkbctrl.c) = 7db64f67827adf216ed7fe8b29a66101
diff --git a/x11/xkbctrl/files/patch-aa b/x11/xkbctrl/files/patch-aa
new file mode 100644
index 000000000000..60aec48104e4
--- /dev/null
+++ b/x11/xkbctrl/files/patch-aa
@@ -0,0 +1,40 @@
+--- Imakefile.org	Sun Jan  9 22:48:52 2000
++++ Imakefile	Sun Jan  9 22:49:13 2000
+@@ -7,35 +7,9 @@
+    DEPLIBS = $(DEPXKBFILELIB) $(DEPXONLYLIB)
+    XTLOCLIBS = $(XTOOLLIB) $(XONLYLIB)
+    XTDEPLIBS = $(DEPXTOOLLIB) $(DEPXONLYLIB)
+-   SRCS = xkbver.c xkbev.c xkbshow.c xkblock.c xkbctrl.c xkbsetmasks.c \
+-	  xkbwatch.c xkbdebug.c xkbleds.c xkbrefresh.c xkbcompat.c xkbget.c \
+-	  xkbtest.c xkbcfgtest.c xkbwrbynames.c xkbextdev.c xkblist.c \
+-	  xkbmaptest.c testmaprules.c xkbsetgeom.c
++   SRCS = xkbctrl.c
+ 
+-all: xkbver xkbev xkbshow xkblock xkbctrl xkbsetmasks xkbwatch \
+-	xkbdebug xkbleds xkbrefresh xkbcompat xkbget xkbtest \
+-	xkbcfgtest xkbwrbynames xkbextdev xkblist \
+-	xkbmaptest testmaprules xkbsetgeom
++all:: xkbctrl
+ 
+-NormalProgramTarget(xkbver,xkbver.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbev,xkbev.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbshow,xkbshow.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkblock,xkblock.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+ NormalProgramTarget(xkbctrl,xkbctrl.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbsetmasks,xkbsetmasks.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbwatch,xkbwatch.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbdebug,xkbdebug.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbleds,xkbleds.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbrefresh,xkbrefresh.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbcompat,xkbcompat.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbget,xkbget.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbtest,xkbtest.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbcfgtest,xkbcfgtest.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbwrbynames,xkbwrbynames.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbextdev,xkbextdev.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkblist,xkblist.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbmaptest,xkbmaptest.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(testmaprules,testmaprules.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-NormalProgramTarget(xkbsetgeom,xkbsetgeom.o,$(DEPLIBS),$(LOCLIBS),NullParameter)
+-
+ DependTarget()
diff --git a/x11/xkbctrl/files/patch-ab b/x11/xkbctrl/files/patch-ab
new file mode 100644
index 000000000000..765ca74c3b16
--- /dev/null
+++ b/x11/xkbctrl/files/patch-ab
@@ -0,0 +1,11 @@
+--- xkbctrl.c.org	Sun Jan  9 22:51:02 2000
++++ xkbctrl.c	Sun Jan  9 22:51:21 2000
+@@ -27,7 +27,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <values.h>
++#include <limits.h>
+ #include <ctype.h>
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
diff --git a/x11/xkbctrl/pkg-comment b/x11/xkbctrl/pkg-comment
new file mode 100644
index 000000000000..9c273f080833
--- /dev/null
+++ b/x11/xkbctrl/pkg-comment
@@ -0,0 +1 @@
+Display and manipulate XKB keyboard controls from the commandline
diff --git a/x11/xkbctrl/pkg-descr b/x11/xkbctrl/pkg-descr
new file mode 100644
index 000000000000..34b930614843
--- /dev/null
+++ b/x11/xkbctrl/pkg-descr
@@ -0,0 +1,12 @@
+Display and manipulate XKB keyboard controls from the commandline
+
+You can set keyboard delay and repeat rates with XKB/X enviroment:
+
+% xkbctrl +repeat 200 20
+
+command help:
+
+% xkbctrl -help
+
+MIHIRA Yoshiro
+<sanpei@sanpei.org>
diff --git a/x11/xkbctrl/pkg-plist b/x11/xkbctrl/pkg-plist
new file mode 100644
index 000000000000..77827be0c272
--- /dev/null
+++ b/x11/xkbctrl/pkg-plist
@@ -0,0 +1 @@
+bin/xkbctrl