diff -Nru joystick-20051019/debian/changelog joystick-20051019/debian/changelog
--- joystick-20051019/debian/changelog	2010-12-13 22:11:29.000000000 +0000
+++ joystick-20051019/debian/changelog	2011-05-13 12:41:12.000000000 +0000
@@ -1,3 +1,12 @@
+joystick (20051019-12ubuntu1.1) natty-proposed; urgency=low
+
+  * debian/patches/w8001.patch: add Wacom w8001 support, thanks to
+    Peter Hutterer.
+  * debian/patches/retry-eintr.patch: do not shutdown when receiving
+    a recoverable signal.
+
+ -- Kees Cook <kees@ubuntu.com>  Fri, 13 May 2011 05:39:09 -0700
+
 joystick (20051019-12ubuntu1) natty; urgency=low
 
   * debian/patches/fix-as-needed.patch: Change linking order to
diff -Nru joystick-20051019/debian/patches/retry-eintr.patch joystick-20051019/debian/patches/retry-eintr.patch
--- joystick-20051019/debian/patches/retry-eintr.patch	1970-01-01 00:00:00.000000000 +0000
+++ joystick-20051019/debian/patches/retry-eintr.patch	2011-05-13 12:38:46.000000000 +0000
@@ -0,0 +1,16 @@
+Description: do not abort when catching a recoverable signal.
+Author: Kees Cook <kees@ubuntu.com>
+
+Index: joystick-20051019/utils/inputattach.c
+===================================================================
+--- joystick-20051019.orig/utils/inputattach.c	2011-05-13 05:35:27.084793079 -0700
++++ joystick-20051019/utils/inputattach.c	2011-05-13 05:37:08.446165443 -0700
+@@ -669,7 +669,7 @@
+ 		retval = EXIT_FAILURE;
+ 	}
+ 
+-	read(fd, NULL, 0);
++	for (errno = 0; errno != EINTR; read(fd, NULL, 0)) ;
+ 
+ 	ldisc = 0;
+ 	ioctl(fd, TIOCSETD, &ldisc);
diff -Nru joystick-20051019/debian/patches/series joystick-20051019/debian/patches/series
--- joystick-20051019/debian/patches/series	2010-12-13 22:03:33.000000000 +0000
+++ joystick-20051019/debian/patches/series	2011-05-13 12:35:23.000000000 +0000
@@ -13,3 +13,5 @@
 evtest-flush-stdout.patch
 handle-max-axes.patch
 fix-as-needed.patch
+w8001.patch
+retry-eintr.patch
diff -Nru joystick-20051019/debian/patches/w8001.patch joystick-20051019/debian/patches/w8001.patch
--- joystick-20051019/debian/patches/w8001.patch	1970-01-01 00:00:00.000000000 +0000
+++ joystick-20051019/debian/patches/w8001.patch	2011-05-13 12:03:43.000000000 +0000
@@ -0,0 +1,18 @@
+Description: add Wacom w8001 support.
+Origin: https://bugzilla.redhat.com/attachment.cgi?id=454722&action=diff
+Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=645235
+
+Index: joystick-20051019/utils/inputattach.c
+===================================================================
+--- joystick-20051019.orig/utils/inputattach.c	2011-05-13 05:02:16.347995393 -0700
++++ joystick-20051019/utils/inputattach.c	2011-05-13 05:02:56.758545047 -0700
+@@ -539,6 +539,9 @@
+ { "--dump",		"-dump",	"Just enable device",
+ 	B2400, CS8,
+ 	0,			0x00,	0x00,	0,	dump_init },
++{ "--w8001",		"-w8001",	"Wacom W8001",
++	B38400, CS8,
++	SERIO_W8001,		0x00,	0x00,	0,	NULL },
+ { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
+ };
+