diff --git a/0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch b/0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch
new file mode 100644
index 0000000..e9c3177
--- /dev/null
+++ b/0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch
@@ -0,0 +1,39 @@
+From ff24ad44384433611fabaa9ae9ba8ac1418fb2df Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Mon, 29 Aug 2016 22:26:43 +0200
+Subject: [PATCH] Fix no-return-in-nonvoid-function errors reported by RPM
+ postbuild check
+
+I: Program returns random data in a function
+E: oath-toolkit no-return-in-nonvoid-function pskcverify.c:43
+E: oath-toolkit no-return-in-nonvoid-function serialno.c:45
+---
+ libpskc/examples/pskcverify.c | 2 ++
+ libpskc/examples/serialno.c   | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/libpskc/examples/pskcverify.c b/libpskc/examples/pskcverify.c
+index 76e1b4d..4e6a2cc 100644
+--- a/libpskc/examples/pskcverify.c
++++ b/libpskc/examples/pskcverify.c
+@@ -40,4 +40,6 @@ main (int argc, const char *argv[])
+ 
+   pskc_done (container);
+   pskc_global_done ();
++
++  return 0;
+ }
+diff --git a/libpskc/examples/serialno.c b/libpskc/examples/serialno.c
+index 7682adb..420cab5 100644
+--- a/libpskc/examples/serialno.c
++++ b/libpskc/examples/serialno.c
+@@ -42,4 +42,6 @@ main (int argc, const char *argv[])
+ 
+   pskc_done (container);
+   pskc_global_done ();
++
++  return 0;
+ }
+-- 
+2.6.6
+
diff --git a/oath-toolkit-2.6.1.tar.gz b/oath-toolkit-2.6.1.tar.gz
deleted file mode 100644
index b45a019..0000000
--- a/oath-toolkit-2.6.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c57831907bc26eadcdf90ba1827d0bd962dd1f737362e817a1dd6d6ec036f79
-size 4238966
diff --git a/oath-toolkit-2.6.2.tar.gz b/oath-toolkit-2.6.2.tar.gz
new file mode 100644
index 0000000..5f5aa4f
--- /dev/null
+++ b/oath-toolkit-2.6.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0
+size 4295786
diff --git a/oath-toolkit.changes b/oath-toolkit.changes
index 4ddf566..6c3ab70 100644
--- a/oath-toolkit.changes
+++ b/oath-toolkit.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug 29 20:03:11 UTC 2016 - mardnh@gmx.de
+
+- Update to Version 2.6.2
+  - no changes in upstream code
+- Fix RPM groups for -devel packages
+- build with libpskc on supported suse-versions
+- Add patch:
+  - 0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch
+
 -------------------------------------------------------------------
 Wed Sep  9 14:31:24 UTC 2015 - t.gruner@katodev.de
 
diff --git a/oath-toolkit.spec b/oath-toolkit.spec
index 2283d9a..cde0b78 100644
--- a/oath-toolkit.spec
+++ b/oath-toolkit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package oath-toolkit
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} >= 1320 || 0%{?sle_version} >= 120100
+%define build_pskc 1
+%endif
 
-%define build_pskc 0
 Name:           oath-toolkit
-Version:        2.6.1
+Version:        2.6.2
 Release:        0
 Summary:        Toolkit for one-time password authentication systems
 License:        GPL-3.0+
 Group:          Productivity/Networking/Security
 Url:            http://www.nongnu.org/oath-toolkit/
 Source:         http://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-%{version}.tar.gz
+Patch:          0001-Fix-no-return-in-nonvoid-function-errors-reported-by.patch
 BuildRequires:  bison
 BuildRequires:  gengetopt
 BuildRequires:  gtk-doc
@@ -33,6 +36,7 @@ BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{build_pskc}
+BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig(xmlsec1)
 %endif
@@ -80,7 +84,7 @@ RFC6030 is supported.
 %package -n     liboath-devel
 Summary:        Library for Open AuTHentication (OATH) HOTP support -- Development Files
 License:        LGPL-2.1+
-Group:          Productivity/Networking/Security
+Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       liboath0 = %{version}
 
@@ -114,7 +118,7 @@ RFC6030 is supported.
 %package -n     libpskc-devel
 Summary:        Library for Portable Symmetric Key Container -- Development Files
 License:        LGPL-2.1+
-Group:          Productivity/Networking/Security
+Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libpskc0 = %{version}
 
@@ -131,6 +135,7 @@ RFC6030 is supported.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure  --with-pam-dir=/%{_lib}/security \
@@ -177,6 +182,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %defattr(-,root,root)
 %doc liboath/COPYING
 %{_libdir}/liboath.so.*
+%{_datadir}/xml/pskc/
 
 %files -n liboath-devel
 %defattr(-,root,root)
@@ -197,7 +203,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files -n libpskc-devel
 %defattr(-,root,root)
 %{_libdir}/libpskc.so
-%{_includedir}/libpskc/
+%{_includedir}/pskc/
 %{_libdir}/pkgconfig/libpskc.pc
 %doc %{_datadir}/gtk-doc/html/libpskc
 %{_mandir}/man3/pskc_*