diff --git a/gnupg-2.0.18-files-are-digests.patch b/gnupg-2.0.18-files-are-digests.patch
index 2d55365..8e1bba7 100644
--- a/gnupg-2.0.18-files-are-digests.patch
+++ b/gnupg-2.0.18-files-are-digests.patch
@@ -4,10 +4,10 @@
  g10/sign.c    |   68 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
  3 files changed, 67 insertions(+), 6 deletions(-)
 
-Index: gnupg-2.1.20/g10/gpg.c
+Index: gnupg-2.1.21/g10/gpg.c
 ===================================================================
---- gnupg-2.1.20.orig/g10/gpg.c	2017-04-03 17:13:56.000000000 +0200
-+++ gnupg-2.1.20/g10/gpg.c	2017-04-04 15:59:20.823799866 +0200
+--- gnupg-2.1.21.orig/g10/gpg.c	2017-04-03 17:13:56.000000000 +0200
++++ gnupg-2.1.21/g10/gpg.c	2017-04-04 15:59:20.823799866 +0200
 @@ -374,6 +374,7 @@ enum cmd_and_opt_values
      oTTYtype,
      oLCctype,
@@ -40,10 +40,10 @@ Index: gnupg-2.1.20/g10/gpg.c
  
  	  case oForceMDC: opt.force_mdc = 1; break;
  	  case oNoForceMDC: opt.force_mdc = 0; break;
-Index: gnupg-2.1.20/g10/options.h
+Index: gnupg-2.1.21/g10/options.h
 ===================================================================
---- gnupg-2.1.20.orig/g10/options.h	2017-04-03 17:13:56.000000000 +0200
-+++ gnupg-2.1.20/g10/options.h	2017-04-04 15:59:20.827799905 +0200
+--- gnupg-2.1.21.orig/g10/options.h	2017-04-03 17:13:56.000000000 +0200
++++ gnupg-2.1.21/g10/options.h	2017-04-04 15:59:20.827799905 +0200
 @@ -214,6 +214,7 @@ struct
    int no_auto_check_trustdb;
    int preserve_permissions;
@@ -52,10 +52,10 @@ Index: gnupg-2.1.20/g10/options.h
    struct groupitem *grouplist;
    int mangle_dos_filenames;
    int enable_progress_filter;
-Index: gnupg-2.1.20/g10/sign.c
+Index: gnupg-2.1.21/g10/sign.c
 ===================================================================
---- gnupg-2.1.20.orig/g10/sign.c	2017-04-03 17:13:56.000000000 +0200
-+++ gnupg-2.1.20/g10/sign.c	2017-04-04 15:59:27.515864763 +0200
+--- gnupg-2.1.21.orig/g10/sign.c	2017-04-03 17:13:56.000000000 +0200
++++ gnupg-2.1.21/g10/sign.c	2017-04-04 15:59:27.515864763 +0200
 @@ -42,6 +42,8 @@
  #include "call-agent.h"
  #include "../common/mbox-util.h"
@@ -65,6 +65,15 @@ Index: gnupg-2.1.20/g10/sign.c
  #ifdef HAVE_DOSISH_SYSTEM
  #define LF "\r\n"
  #else
+@@ -695,6 +697,8 @@ write_signature_packets(ctrl_t ctrl,
+       if (duration || opt.sig_policy_url
+           || opt.sig_notations || opt.sig_keyserver_url)
+         sig->version = 4;
++      else if (opt.files_are_digests)
++        sig->version = 3;
+       else
+         sig->version = pk->version;
+
 @@ -718,8 +720,12 @@ write_signature_packets (ctrl_t ctrl,
            mk_notation_policy_etc (sig, NULL, pk);
          }
diff --git a/gpg2.changes b/gpg2.changes
index 0ffc0eb..5b165e9 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 19 11:59:24 UTC 2017 - marco.strigl@suse.com
+
+- GnuPG 2.1.21:
+  * modified gnupg-2.0.18-files-are-digests.patch to work with 
+    obs-sign again bsc#1039899
+
 -------------------------------------------------------------------
 Mon May 15 20:49:25 UTC 2017 - astieger@suse.com