diff --git a/libgpg-error-1.4.tar.bz2 b/libgpg-error-1.4.tar.bz2
deleted file mode 100644
index 7f59794..0000000
--- a/libgpg-error-1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f71a3f7da2d0b5ea241186848e33e36714952d40d75d98278c4f184b79915f4
-size 467196
diff --git a/libgpg-error-1.6.tar.bz2 b/libgpg-error-1.6.tar.bz2
new file mode 100644
index 0000000..881a64c
--- /dev/null
+++ b/libgpg-error-1.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa7df632134dfd3d4e65f5a98edd6bb9a97b498db911f4287bbaeb5ae83a1bad
+size 382110
diff --git a/libgpg-error.changes b/libgpg-error.changes
index 6d7e90a..4f0daa6 100644
--- a/libgpg-error.changes
+++ b/libgpg-error.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Nov 21 18:21:11 CET 2007 - mkoenig@suse.de
+
+- update to version 1.6 
+  * Minor build system fixes
+  * gpg-error has a new option --version
+  * Interface changes relative to the 1.4 release:
+    GPG_ERR_UNFINISHED            NEW
+    GPG_ERR_SOURCE_GPA            NEW
+    GPG_ERR_SOURCE_KLEO           NEW
+- package branch to conform shlib policy:
+  libgpg-error0
+
 -------------------------------------------------------------------
 Wed Dec 13 12:37:00 CET 2006 - mkoenig@suse.de
 
diff --git a/libgpg-error.spec b/libgpg-error.spec
index f7d3a6b..a54db0b 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libgpg-error (Version 1.4)
+# spec file for package libgpg-error (Version 1.6)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,13 +11,13 @@
 # norootforbuild
 
 Name:           libgpg-error
-URL:            http://www.gnupg.org/
-Version:        1.4
-Release:        18
+Url:            http://www.gnupg.org/
+Version:        1.6
+Release:        1
 Summary:        Library That Defines Common Error Values for All GnuPG Components
-License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License:        GPL v2 or later; LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
-Autoreqprov:    on
+AutoReqProv:    on
 Source:         %name-%version.tar.bz2
 # rename package to "libgpg-error-nld" and set this to 1 for NLD
 %define nld_build 0
@@ -31,6 +31,24 @@ pinentry, SmartCard Daemon, and possibly more in the future.
 
 
 
+Authors:
+--------
+    Marcus Brinkmann <marcus@g10code.com>
+
+%package -n libgpg-error0
+Summary:        Library That Defines Common Error Values for All GnuPG Components
+License:        GPL v2 or later; LGPL v2.1 or later
+Group:          Development/Libraries/C and C++
+Provides:       libgpg-error = %version
+Obsoletes:      libgpg-error < %version
+
+%description -n libgpg-error0
+This is a library that defines common error values for all GnuPG
+components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+pinentry, SmartCard Daemon, and possibly more in the future.
+
+
+
 Authors:
 --------
     Marcus Brinkmann <marcus@g10code.com>
@@ -40,10 +58,8 @@ Summary:        Development package for libgpg-error
 Group:          Development/Libraries/C and C++
 %if %nld_build
 Conflicts:      libgpg-error-devel
-%else
-Provides:       libgpg-error:/usr/include/gpg-error.h
 %endif
-Requires:       libgpg-error == %version
+Requires:       libgpg-error0 == %version
 
 %description devel
 Files needed for software development using libgpg-error.
@@ -83,31 +99,41 @@ mv $RPM_BUILD_ROOT/%{_lib}/libgpg-error.a $RPM_BUILD_ROOT%{_libdir}
 # Drop the lisp stuff, it depends on ASDF and CFFI
 # which needs to be packaged first
 rm -r %{buildroot}/usr/share/common-lisp
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -n libgpg-error0
 %run_ldconfig
 
-%postun
+%postun -n libgpg-error0
 %run_ldconfig
 
-%files
+%files -n libgpg-error0 -f %{name}.lang
 %defattr(-,root,root)
-%doc README NEWS ChangeLog COPYING.LIB COPYING AUTHORS ABOUT-NLS
-%_datadir/locale/*/LC_MESSAGES/libgpg-error*.mo
 /%_lib/libgpg-error*.so.*
 
 %files devel
 %defattr(-,root,root)
+%doc README NEWS ChangeLog COPYING.LIB COPYING AUTHORS ABOUT-NLS
 %_datadir/aclocal/gpg-error.m4
 %_includedir/*
 %_bindir/*
 %_libdir/libgpg-error*.a
 %_libdir/libgpg-error*.so
 
-%changelog -n libgpg-error
+%changelog
+* Wed Nov 21 2007 - mkoenig@suse.de
+- update to version 1.6
+  * Minor build system fixes
+  * gpg-error has a new option --version
+  * Interface changes relative to the 1.4 release:
+  GPG_ERR_UNFINISHED            NEW
+  GPG_ERR_SOURCE_GPA            NEW
+  GPG_ERR_SOURCE_KLEO           NEW
+- package branch to conform shlib policy:
+  libgpg-error0
 * Wed Dec 13 2006 - mkoenig@suse.de
 - get rid of .la file and fix devel so link
 * Tue Dec 05 2006 - mkoenig@suse.de