diff --git a/package/misc/joystick/hotfixes.patch b/package/misc/joystick/hotfixes.patch
deleted file mode 100644
index f556ac9a0..000000000
--- a/package/misc/joystick/hotfixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/misc/joystick/hotfixes.patch
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- joystick-1.2.14/Makefile	1999-03-05 20:37:56.000000000 +0100
-+++ joystick-1.2.14/Makefile	2005-03-04 10:10:03.510668744 +0100
-@@ -28,6 +28,7 @@
- CC		= gcc
- 
- CPPFLAGS	= -I.#						# for joystick.h
-+CPPFLAGS	+= -I /usr/include/linux24
- 
- CFLAGS		= -O2 -Wall -pipe -m486 -fomit-frame-pointer#	# i386
- # CFLAGS	= -O2 -Wall -pipe -m68020 -ffixed-a2#		# m68k
-@@ -60,16 +61,13 @@
- JOYOPRE		:= $(shell if [ -f .prerelease ]; then cat .prerelease; else echo 0; fi)
- JOYPRE		:= $(shell expr $(JOYOPRE) + 1)
- 
--compile: joystick.o $(DRIVERS) $(PROGRAMS)
-+compile: $(PROGRAMS)
- 
- install: compile
--	mkdir -p $(MODDIR)
--	rm -f $(MODDIR)/joy*.o
--	cp joy*.o $(MODDIR)
--	/sbin/depmod -a
--	install -m 644 joystick.h /usr/include/linux
--	install -m 755 jscal /usr/local/bin
--	install -m 755 jstest /usr/local/bin
-+	install -m 755 jscal /usr/bin
-+	install -m 755 jstest /usr/bin
-+	install -m 755 jsattach /usr/bin
-+	cp *.txt /usr/share/doc/joystick/
- 
- joystick.o: joystick.c joystick.h
- 	$(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joystick.c -o joystick.o
diff --git a/package/misc/joystick/joystick.conf b/package/misc/joystick/joystick.conf
index cc6e854f6..b063b50fd 100644
--- a/package/misc/joystick/joystick.conf
+++ b/package/misc/joystick/joystick.conf
@@ -22,13 +22,13 @@
 
 joystick_pm()
 {
-	install -m 644 joystick.h $includedir
 	install -m 755 jscal $bindir
 	install -m 755 jstest $bindir
-	install -m 755 jsattach $bindir
+	install -m 755 inputattach $bindir
 }
 
-makeopt="CFLAGS="" jscal jstest jsattach"
+makeopt="CFLAGS="" jscal jstest inputattach"
 makeinstopt=""
+srcdir="${pkg}-${ver}/utils/"
 
 postmake="joystick_pm"
diff --git a/package/misc/joystick/joystick.desc b/package/misc/joystick/joystick.desc
index 5b9c2e89e..0606e077e 100644
--- a/package/misc/joystick/joystick.desc
+++ b/package/misc/joystick/joystick.desc
@@ -23,7 +23,7 @@
 [I] Joystick utilities
 
 [T] The joystick package contains the three joystick utilities jscal,
-[T] jsattach and jstest.
+[T] inputattach and jstest.
 
 [U] http://atrey.karlin.mff.cuni.cz/~vojtech/input/joystick.html
 
@@ -34,8 +34,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.2.14
+[V] 2006-05-06
 [P] X -?---5---9 165.600
 
-[D] 3788013029 joystick-1.2.14.tar.gz http://www.ibiblio.org/pub/Linux/kernel/patches/console/
-
+[D] X joystick-2006-05-06.tar.gz cvs://pserver:anonymous@cvs.sourceforge.net:/cvsroot/linuxconsole::ruby/!2006-05-06/