diff --git a/gnupg-1.9.18-tmpdir.diff b/gnupg-1.9.18-tmpdir.diff
index 6f22e0b..85ae375 100644
--- a/gnupg-1.9.18-tmpdir.diff
+++ b/gnupg-1.9.18-tmpdir.diff
@@ -1,7 +1,9 @@
---- agent/gpg-agent.c
+Index: agent/gpg-agent.c
+===================================================================
+--- agent/gpg-agent.c.orig
 +++ agent/gpg-agent.c
-@@ -789,6 +789,10 @@
-       int fd_ssh;
+@@ -874,6 +874,10 @@ main (int argc, char **argv )
+       gnupg_fd_t fd_ssh;
        pid_t pid;
  
 +      char *tmp1, *tmp;
@@ -11,7 +13,7 @@
        /* Remove the DISPLAY variable so that a pinentry does not
           default to a specific display.  There is still a default
           display when gpg-agent was started using --display or a
-@@ -800,16 +804,26 @@
+@@ -885,16 +889,25 @@ main (int argc, char **argv )
          unsetenv ("DISPLAY");
  #endif
  
@@ -21,23 +23,23 @@
 +      len = strlen(tmp1) + strlen(tmp2) + 10;
 +      tmp = malloc(len);
 +
-+      snprintf(tmp, len, "%s%s%s", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2);   
++      snprintf(tmp, len, "%s%s%s", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2);
  
        /* Create the sockets.  */
-       socket_name = create_socket_name (standard_socket,
+       socket_name = create_socket_name (use_standard_socket,
                                          "S.gpg-agent",
 -                                        "/tmp/gpg-XXXXXX/S.gpg-agent");
 -      if (opt.ssh_support)
 +                                        tmp);
 +      if (opt.ssh_support) {
 +        snprintf(tmp, len, "%s%s%s.ssh", tmp1, tmp1 && strlen(tmp1) > 0 ? "/" : "", tmp2);
- 	socket_name_ssh = create_socket_name (standard_socket, 
+ 	socket_name_ssh = create_socket_name (use_standard_socket, 
                                              "S.gpg-agent.ssh",
 -                                            "/tmp/gpg-XXXXXX/S.gpg-agent.ssh");
+-
 +                                            tmp);
 +      }
- 
 +      free(tmp);
-       fd = create_server_socket (standard_socket, socket_name);
+       fd = create_server_socket (use_standard_socket, socket_name, 0,
+                                  &socket_nonce);
        if (opt.ssh_support)
- 	fd_ssh = create_server_socket (standard_socket, socket_name_ssh);
diff --git a/gnupg-2.0.4-install_tools.diff b/gnupg-2.0.4-install_tools.diff
index bb56da6..8ac3976 100644
--- a/gnupg-2.0.4-install_tools.diff
+++ b/gnupg-2.0.4-install_tools.diff
@@ -1,28 +1,34 @@
---- common/Makefile.am
+Index: common/Makefile.am
+===================================================================
+--- common/Makefile.am.orig
 +++ common/Makefile.am
-@@ -26,7 +26,7 @@
+@@ -31,7 +31,7 @@ CLEANFILES = audit-events.h status-codes
  
  AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
  
 -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) -fPIC
  
- common_sources = \
- 	common-defs.h \
---- gl/Makefile.am
+ include $(top_srcdir)/am/cmacros.am
+ 
+Index: gl/Makefile.am
+===================================================================
+--- gl/Makefile.am.orig
 +++ gl/Makefile.am
 @@ -13,6 +13,8 @@
  
- AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+ AUTOMAKE_OPTIONS = 1.5 gnits
  
 +AM_CFLAGS = -fPIC
 +
  noinst_LIBRARIES = libgnu.a
  
  libgnu_a_SOURCES =
---- jnlib/Makefile.am
+Index: jnlib/Makefile.am
+===================================================================
+--- jnlib/Makefile.am.orig
 +++ jnlib/Makefile.am
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ TESTS = $(module_tests)
  AM_CPPFLAGS = -I$(top_srcdir)/intl
  
  # We need libgcrypt because libjnlib-config includes gcrypt.h
@@ -31,9 +37,11 @@
  
  noinst_LIBRARIES = libjnlib.a
  
---- tools/Makefile.am
+Index: tools/Makefile.am
+===================================================================
+--- tools/Makefile.am.orig
 +++ tools/Makefile.am
-@@ -27,14 +27,14 @@
+@@ -25,14 +25,14 @@ EXTRA_DIST = \
  AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
  include $(top_srcdir)/am/cmacros.am
  
@@ -51,7 +59,7 @@
  endif
  
  if BUILD_SYMCRYPTRUN
-@@ -44,19 +44,19 @@
+@@ -43,14 +43,14 @@ endif
  
  bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun}
  if !HAVE_W32_SYSTEM
@@ -59,16 +67,19 @@
 +bin_PROGRAMS += watchgnupg gpgparsemail gpgsplit
  endif
  
+ if !DISABLE_REGEX
+ libexec_PROGRAMS = gpg-check-pattern
+ endif
+ 
 -noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
 +noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
  
  common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
  pwquery_libs = ../common/libsimple-pwquery.a
- 
- gpgsplit_LDADD = $(common_libs) \
-	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+@@ -59,6 +59,7 @@ gpgsplit_LDADD = $(common_libs) \
+ 	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
  		 $(ZLIBS) $(LIBINTL) $(LIBICONV)
--
+ 
 +gpgsplit_LDFLAGS = -pie
  gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
  
diff --git a/gnupg-2.0.5.tar.bz2 b/gnupg-2.0.5.tar.bz2
deleted file mode 100644
index a9882d5..0000000
--- a/gnupg-2.0.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c5133eb8bee56013c851f9c7da2c4823ac4de8f6b00bd9f9b97a75c8494ad69
-size 3513529
diff --git a/gnupg-2.0.8.tar.bz2 b/gnupg-2.0.8.tar.bz2
new file mode 100644
index 0000000..4b57014
--- /dev/null
+++ b/gnupg-2.0.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16f310afe4740a26475c7273f585861a4bdefecbde27c214cc30c0db45d26913
+size 3654523
diff --git a/gpg2.changes b/gpg2.changes
index 5f04bf5..3d64a73 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan  8 10:48:30 CET 2008 - sassmann@suse.de
+
+- update to GnuPG-2.0.8
+- adapted patches to apply properly
+  * gnupg-1.9.18-tmpdir.diff
+  * gnupg-2.0.4-install_tools.diff
+- gnupg-2.0.5.fixes-from-svn-20070812.diff commented out,
+  included in upstream 2.0.8
+- use optflags during build
+
 -------------------------------------------------------------------
 Wed Sep 12 22:40:46 CEST 2007 - ltinkl@suse.cz
 
diff --git a/gpg2.spec b/gpg2.spec
index 38f9757..705eecb 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gpg2 (Version 2.0.5)
+# spec file for package gpg2 (Version 2.0.8)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 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.
 #
@@ -24,9 +24,9 @@ Requires:       pinentry, dirmngr
 Provides:       newpg gpg = 1.4.7 gnupg = %{version}
 Obsoletes:      newpg gpg <= 1.4.7
 Summary:        GnuPG 2
-Version:        2.0.5
-Release:        2
-Source:         ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.5.tar.bz2
+Version:        2.0.8
+Release:        1
+Source:         gnupg-2.0.8.tar.bz2
 Patch1:         gnupg-2.0.5.fixes-from-svn-20070812.diff
 Patch3:         gnupg-2.0.4-oldkey.diff
 Patch5:         gnupg-1.9.22-ccid-driver-fix.diff
@@ -48,7 +48,8 @@ Authors:
 
 %prep
 %setup  -q -n gnupg-%version
-%patch1 -p1
+#%patch1 -p1
+#included in upstream 2.0.8
 %patch3
 %patch5
 %patch6
@@ -63,6 +64,7 @@ sed -i '/AM_GNU_GETTEXT_VERSION/s/0.16.1/0.16/' configure.ac
 autoreconf -fi
 
 %build
+CFLAGS="%{optflags}" \
 ./configure \
                 --prefix=%{_prefix} \
                 --sysconfdir=/etc \
@@ -117,7 +119,16 @@ make check
 /usr/sbin/addgnupghome
 /usr/sbin/applygnupgdefaults
 /usr/share/gnupg
+
 %changelog
+* Tue Jan 08 2008 - sassmann@suse.de
+- update to GnuPG-2.0.8
+- adapted patches to apply properly
+  * gnupg-1.9.18-tmpdir.diff
+  * gnupg-2.0.4-install_tools.diff
+- gnupg-2.0.5.fixes-from-svn-20070812.diff commented out,
+  included in upstream 2.0.8
+- use optflags during build
 * Wed Sep 12 2007 - ltinkl@suse.cz
 - fix #304749 - gpg2 unable to use old secret key
 * Mon Sep 10 2007 - ltinkl@suse.cz