diff --git a/.gitignore b/.gitignore
index 09e6348..8fee3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/ykpers-1.6.2.tar.gz
diff --git a/sources b/sources
index 6fe6eda..67d2c1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78bc83dbadbc547ccb5242dd812ab627  ykpers-1.6.0.tar.gz
+a71c81eb7e306e132aa4b1c76d6b8275  ykpers-1.6.2.tar.gz
diff --git a/ykpers-1.4.1-bigendian.patch b/ykpers-1.4.1-bigendian.patch
deleted file mode 100644
index 4b8b59a..0000000
--- a/ykpers-1.4.1-bigendian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ykpers-1.4.1/tests/test_args_to_config.c.bigendian ykpers-1.4.1/tests/test_args_to_config.c
---- ykpers-1.4.1/tests/test_args_to_config.c.bigendian	2011-04-29 17:09:24.000000000 +0200
-+++ ykpers-1.4.1/tests/test_args_to_config.c	2011-04-29 17:09:37.000000000 +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.4.1-getopt.patch b/ykpers-1.4.1-getopt.patch
deleted file mode 100644
index 6a01ef7..0000000
--- a/ykpers-1.4.1-getopt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ykpers-1.4.1/ykpersonalize.c.getopt ykpers-1.4.1/ykpersonalize.c
---- ykpers-1.4.1/ykpersonalize.c.getopt	2011-04-29 16:05:30.000000000 +0200
-+++ ykpers-1.4.1/ykpersonalize.c	2011-04-29 16:05:45.000000000 +0200
-@@ -205,7 +205,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-1.6.0-getopt.patch b/ykpers-1.6.0-getopt.patch
deleted file mode 100644
index e3ebbe9..0000000
--- a/ykpers-1.6.0-getopt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 82db174..bd590be 100644
--- a/ykpers.spec
+++ b/ykpers.spec
@@ -1,14 +1,13 @@
 Name:           ykpers
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        1.6.2
+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.6.0-getopt.patch
-Patch1:         %{name}-1.6.0-bigendian.patch
+Patch0:         %{name}-1.6.0-bigendian.patch
 
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
@@ -32,8 +31,7 @@ use ykpers.
 
 %prep
 %setup -q
-%patch0 -p1 -b .getopt
-%patch1 -p1 -b .bigendian
+%patch0 -p1 -b .bigendian
 
 %build
 %configure --enable-static=no --disable-rpath \
@@ -69,7 +67,7 @@ pwd
 %{_bindir}/ykpersonalize
 %{_bindir}/ykchalresp
 %{_libdir}/libykpers-1.so.1
-%{_libdir}/libykpers-1.so.1.6.0
+%{_libdir}/libykpers-1.so.1.6.2
 %{_mandir}/man1/ykpersonalize.1.gz
 %{_mandir}/man1/ykchalresp.1.gz
 /lib/udev/rules.d/70-yubikey.rules
@@ -83,6 +81,9 @@ pwd
 %exclude %{_libdir}/libykpers-1.la
 
 %changelog
+* Tue Nov 29 2011 - Maxim Burgerhout <wzzrd@fedoraproject.org> - 1.6.2-1
+- New upstream version with some minor bugfixes
+
 * Thu Jul 21 2011 - Maxim Burgerhout <wzzrd@fedoraproject.org> - 1.6.0-2
 - Rebuild for rpm-4.9.1 trailing slash bug