diff --git a/.gitignore b/.gitignore
index 00b3f63..09e6348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 ykpers-1.3.3.tar.gz
 /ykpers-1.3.4.tar.gz
 /ykpers-1.4.1.tar.gz
+/ykpers-1.6.0.tar.gz
diff --git a/sources b/sources
index 344ef14..6fe6eda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0e75bc020d8efefbf0cf18df23a7219  ykpers-1.4.1.tar.gz
+78bc83dbadbc547ccb5242dd812ab627  ykpers-1.6.0.tar.gz
diff --git a/ykpers-1.6.0-bigendian.patch b/ykpers-1.6.0-bigendian.patch
new file mode 100644
index 0000000..13e8025
--- /dev/null
+++ b/ykpers-1.6.0-bigendian.patch
@@ -0,0 +1,11 @@
+diff -up ykpers-1.6.0/tests/test_args_to_config.c.bigendian ykpers-1.6.0/tests/test_args_to_config.c
+--- ykpers-1.6.0/tests/test_args_to_config.c.bigendian	2011-07-21 11:27:59.614946704 +0200
++++ ykpers-1.6.0/tests/test_args_to_config.c	2011-07-21 11:28:52.805128364 +0200
+@@ -86,6 +86,7 @@ void _check_success(int rc, YKP_CONFIG *
+ 	/* insert CRC */
+ 	ycfg->crc = ~yubikey_crc16 ((unsigned char *) ycfg,
+ 				    offsetof(struct config_st, crc));
++	ycfg->crc = yk_endian_swap_16(ycfg->crc);
+ 
+ 	config_matches_expected = ! memcmp(expected, ycfg, sizeof(*ycfg));
+ 	if (! config_matches_expected) {
diff --git a/ykpers-1.6.0-getopt.patch b/ykpers-1.6.0-getopt.patch
new file mode 100644
index 0000000..e3ebbe9
--- /dev/null
+++ b/ykpers-1.6.0-getopt.patch
@@ -0,0 +1,12 @@
+diff -up ykpers-1.6.0/ykpers-args.c.getopt ykpers-1.6.0/ykpers-args.c
+--- ykpers-1.6.0/ykpers-args.c.getopt	2011-07-21 11:24:59.516717544 +0200
++++ ykpers-1.6.0/ykpers-args.c	2011-07-21 11:25:10.343550972 +0200
+@@ -197,7 +197,7 @@ int args_to_config(int argc, char **argv
+ 		   bool *aesviahash,
+ 		   int *exit_code)
+ {
+-	char c;
++	int c;
+ 	const char *aeshash = NULL;
+ 	bool new_access_code = false;
+ 	bool slot_chosen = false;
diff --git a/ykpers.spec b/ykpers.spec
index 75b59e9..b034235 100644
--- a/ykpers.spec
+++ b/ykpers.spec
@@ -1,14 +1,14 @@
 Name:           ykpers
-Version:        1.4.1
-Release:        2%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        Yubikey personalization program
 
 Group:          Applications/System
 License:        BSD
 URL:            http://code.google.com/p/yubikey-personalization/
 Source0:        http://yubikey-personalization.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         %{name}-1.4.1-getopt.patch
-Patch1:         %{name}-1.4.1-bigendian.patch
+Patch0:         %{name}-1.6.0-getopt.patch
+Patch1:         %{name}-1.6.0-bigendian.patch
 
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
@@ -36,7 +36,8 @@ use ykpers.
 %patch1 -p1 -b .bigendian
 
 %build
-%configure --disable-static \
+%configure --enable-static=no --disable-rpath \
+           --with-udevrulesdir=/lib/udev/rules.d \
 %ifnarch s390 s390x
     --with-backend=libusb-1.0
 %else
@@ -66,9 +67,12 @@ pwd
 %doc AUTHORS COPYING README ChangeLog NEWS
 %doc doc/Read-Me.asciidoc doc/Compatibility.asciidoc
 %{_bindir}/ykpersonalize
+%{_bindir}/ykchalresp
 %{_libdir}/libykpers-1.so.1
-%{_libdir}/libykpers-1.so.1.3.0
+%{_libdir}/libykpers-1.so.1.6.0
 %{_mandir}/man1/ykpersonalize.1.gz
+%{_mandir}/man1/ykchalresp.1.gz
+/lib/udev/rules.d/70-yubikey.rules
 
 %files devel
 %defattr(-,root,root,-)
@@ -79,6 +83,10 @@ pwd
 %exclude %{_libdir}/libykpers-1.la
 
 %changelog
+* Thu Jul 21 2011 - Maxim Burgerhout <wzzrd@fedoraproject.org> - 1.6.0-1
+- Update to upstream version 1.6.0 (support for firmware 2.3.x, oath changes)
+- First implementation of udev rules for ykpers
+
 * Fri Apr 29 2011 - Dan Horák <dan[at]danny.cz> - 1.4.1-2
 - fix build on big endians and with default unsigned char (like s390(x))