diff --git a/x11/Makefile b/x11/Makefile
index c78898d1636d..5ecbdef3cfc1 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -141,6 +141,7 @@
     SUBDIR += xfishtank
     SUBDIR += xfree86_xkb_xml
     SUBDIR += xgrab
+    SUBDIR += xinput
     SUBDIR += xkbctrl
     SUBDIR += xkbset
     SUBDIR += xkeycaps
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
new file mode 100644
index 000000000000..244bbd839546
--- /dev/null
+++ b/x11/xinput/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xinput
+# Date created:			05 July 2003
+# Whom:				Martin Ranne <gasp@ridcully.dnsalias.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xinput
+PORTVERSION=	1.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=utilities
+
+MAINTAINER=	gasp@ridcully.dnsalias.org
+COMMENT=	Very useful utility for configuring and testing XInput devices
+
+USE_IMAKE=	yes
+
+MAN1=		xinput.1
+
+.include <bsd.port.mk>
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
new file mode 100644
index 000000000000..9e53b7d86b65
--- /dev/null
+++ b/x11/xinput/distinfo
@@ -0,0 +1 @@
+MD5 (xinput-1.2.tar.gz) = 0ee7ad8dca7a3add2b63b1c96bc87399
diff --git a/x11/xinput/pkg-descr b/x11/xinput/pkg-descr
new file mode 100644
index 000000000000..f38a10d2bcc9
--- /dev/null
+++ b/x11/xinput/pkg-descr
@@ -0,0 +1,6 @@
+xinput 1.x by Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
+
+xinput is an  utility  I have built  to  configure and test my  XInput
+devices.    The functionalities aren't    complete  but  they fill  my
+needs. If you have  some ideas or needs  for improvement, feel free to
+contact me.  Any feedback welcome.
diff --git a/x11/xinput/pkg-plist b/x11/xinput/pkg-plist
new file mode 100644
index 000000000000..94c3093614c5
--- /dev/null
+++ b/x11/xinput/pkg-plist
@@ -0,0 +1 @@
+bin/xinput