diff --git a/metadata/md5-cache/x11-apps/xinput-1.5.4 b/metadata/md5-cache/x11-apps/xinput-1.5.4
deleted file mode 100644
index e17638b..0000000
--- a/metadata/md5-cache/x11-apps/xinput-1.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5 >=x11-proto/inputproto-2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
-DESCRIPTION=Utility to set XInput device parameters
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.4.5
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.5.4.tar.bz2
-_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
-_md5_=552d775e15616c160d19b83929d39e7c
diff --git a/metadata/md5-cache/x11-apps/xinput-1.6.0 b/metadata/md5-cache/x11-apps/xinput-1.6.0
new file mode 100644
index 0000000..5b99b2f
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xinput-1.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama >=x11-proto/inputproto-2.1.99.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23
+DESCRIPTION=Utility to set XInput device parameters
+EAPI=4
+HOMEPAGE=http://xorg.freedesktop.org/
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/app/xinput-1.6.0.tar.bz2
+_eclasses_=autotools	addbdf6cce5024ac93ad2084ad5e1d2d	autotools-utils	966fed1f979132a778b0b48c74a16adb	base	fc89786f3f7e7bcf03334359bd5b639b	eutils	33ef77a15337022e05342d2c772a7a5a	flag-o-matic	01a8b1eb019305bc4b4a8bd0b04e4cd8	libtool	0fd90d183673bf1107465ec45849d1ea	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29	xorg-2	b83efc910bb3ac2c64f89e2623f181f5
+_md5_=2f3f8f877e76ddc49174c19cec4744d3
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
index e47b8d7..3a6f002 100644
--- a/x11-apps/xinput/Manifest
+++ b/x11-apps/xinput/Manifest
@@ -1 +1 @@
-DIST xinput-1.5.4.tar.bz2 134702 RMD160 4df018cee7d431517b85b6624ec5e4312c6ba0bd SHA1 4e77f4034aa4bc720726beb0795d77a47a71d2c8 SHA256 a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360
+DIST xinput-1.6.0.tar.bz2 146209 RMD160 d5fccf7e6d91902519a08dc6b907b4c78c2acb62 SHA1 958b77a2acf52197b9a1e3e3d11e9bc57fbb1e6c SHA256 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
diff --git a/x11-apps/xinput/xinput-1.5.4.ebuild b/x11-apps/xinput/xinput-1.5.4.ebuild
deleted file mode 100644
index 05f1657..0000000
--- a/x11-apps/xinput/xinput-1.5.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.5.4.ebuild,v 1.1 2012/01/01 14:27:34 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Utility to set XInput device parameters"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libX11-1.3
-	x11-libs/libXext
-	>=x11-libs/libXi-1.4.5"
-DEPEND="${RDEPEND}
-	>=x11-proto/inputproto-2.0"
diff --git a/x11-apps/xinput/xinput-1.6.0.ebuild b/x11-apps/xinput/xinput-1.6.0.ebuild
new file mode 100644
index 0000000..369f69c
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinput/xinput-1.6.0.ebuild,v 1.8 2012/07/12 17:19:19 ranger Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	x11-libs/libXext
+	>=x11-libs/libXi-1.5.99.1
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.1"