diff --git a/debugsubpkg.diff b/debugsubpkg.diff
index 19e20bb..de7bcb3 100644
--- a/debugsubpkg.diff
+++ b/debugsubpkg.diff
@@ -1,7 +1,5 @@
-Create a debuginfo package for each subpackage.
-
 --- ./build/files.c.orig	2017-02-16 09:52:49.292092380 +0000
-+++ ./build/files.c	2017-03-22 11:55:13.814882170 +0000
++++ ./build/files.c	2017-03-22 12:11:05.013909767 +0000
 @@ -21,6 +21,10 @@
  #include <rpm/rpmlog.h>
  #include <rpm/rpmbase64.h>
@@ -13,7 +11,7 @@ Create a debuginfo package for each subpackage.
  #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
  #include "misc/fts.h"
  #include "lib/rpmfi_internal.h"	/* XXX fi->apath */
-@@ -2155,13 +2159,301 @@ exit:
+@@ -2155,13 +2159,302 @@ exit:
      return rc;
  }
  
@@ -263,6 +261,7 @@ Create a debuginfo package for each subpackage.
 +    char *dwz_dbg_buildid = NULL;
 +    DIR *d;
 +    struct dirent *de;
++    int i;
 +
 +    snprintf(tmp, 1024, "%s%s", buildroot, "/usr/lib/debug/.dwz");
 +    if (lstat(tmp, &sbuf) == 0 && S_ISDIR(sbuf.st_mode))
@@ -315,7 +314,7 @@ Create a debuginfo package for each subpackage.
      genSourceRpmName(spec);
      
      for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-@@ -2179,8 +2471,40 @@ rpmRC processBinaryFiles(rpmSpec spec, r
+@@ -2179,8 +2472,40 @@ rpmRC processBinaryFiles(rpmSpec spec, r
  	rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
  	free(nvr);
  		   
@@ -358,7 +357,7 @@ Create a debuginfo package for each subpackage.
  	    goto exit;
  
  	a = headerGetString(pkg->header, RPMTAG_ARCH);
-@@ -2215,6 +2539,7 @@ rpmRC processBinaryFiles(rpmSpec spec, r
+@@ -2215,6 +2540,7 @@ rpmRC processBinaryFiles(rpmSpec spec, r
      }
  exit:
      check_fileList = freeStringBuf(check_fileList);
@@ -366,8 +365,8 @@ Create a debuginfo package for each subpackage.
      
      return rc;
  }
---- ./build/parseSpec.c.orig	2017-03-22 11:52:02.332400093 +0000
-+++ ./build/parseSpec.c	2017-03-22 11:52:43.249280459 +0000
+--- ./build/parseSpec.c.orig	2017-03-22 12:10:11.304029953 +0000
++++ ./build/parseSpec.c	2017-03-22 12:10:20.142010341 +0000
 @@ -564,7 +564,7 @@ static void initSourceHeader(rpmSpec spe
  }
  
@@ -378,7 +377,7 @@ Create a debuginfo package for each subpackage.
      const char *arch, *name;
      char *evr, *isaprov;
 --- ./build/rpmbuild_internal.h.orig	2017-02-16 09:40:09.788649545 +0000
-+++ ./build/rpmbuild_internal.h	2017-03-22 11:52:43.249280459 +0000
++++ ./build/rpmbuild_internal.h	2017-03-22 12:10:20.143010339 +0000
 @@ -442,6 +442,13 @@ int addReqProv(Package pkg, rpmTagVal ta
  
  
@@ -393,8 +392,8 @@ Create a debuginfo package for each subpackage.
   * Add rpmlib feature dependency.
   * @param pkg		package
   * @param feature	rpm feature name (i.e. "rpmlib(Foo)" for feature Foo)
---- ./macros.in.orig	2017-03-22 11:52:02.335400084 +0000
-+++ ./macros.in	2017-03-22 11:52:43.250280456 +0000
+--- ./macros.in.orig	2017-03-22 12:10:11.307029946 +0000
++++ ./macros.in	2017-03-22 12:10:20.143010339 +0000
 @@ -186,24 +186,10 @@
  #	Template for debug information sub-package.
  %debug_package \
@@ -420,8 +419,8 @@ Create a debuginfo package for each subpackage.
  %description debugsource\
  This package provides debug sources for package %{name}.\
  Debug sources are useful when developing applications that use this\
---- ./scripts/find-debuginfo.sh.orig	2017-03-22 11:52:02.331400096 +0000
-+++ ./scripts/find-debuginfo.sh	2017-03-22 11:52:43.250280456 +0000
+--- ./scripts/find-debuginfo.sh.orig	2017-03-22 12:10:11.303029955 +0000
++++ ./scripts/find-debuginfo.sh	2017-03-22 12:10:20.144010337 +0000
 @@ -220,6 +220,11 @@ debug_link()
  # Provide .2, .3, ... symlinks to all filename instances of this build-id.
  make_id_dup_link()