diff --git a/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch b/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
new file mode 100644
index 0000000..8dcd128
--- /dev/null
+++ b/0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
@@ -0,0 +1,30 @@
+From e8b18b9cc2e92d7f9e4bdccdea40c224e742fb1f Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Tue, 25 Jul 2017 21:04:58 +0200
+Subject: [PATCH] macros: enable debugsource and debuginfo-subpkgs by default
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ macros.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/macros.in b/macros.in
+index 851822891..f71fcc103 100644
+--- a/macros.in
++++ b/macros.in
+@@ -549,10 +549,10 @@ package or when debugging this package.\
+ %_unique_debug_srcs	1
+ 
+ # Whether rpm should put debug source files into its own subpackage
+-#%_debugsource_packages	1
++%_debugsource_packages	1
+ 
+ # Whether rpm should create extra debuginfo packages for each subpackage
+-#%_debuginfo_subpackages 1
++%_debuginfo_subpackages 1
+ 
+ #
+ # Use internal dependency generator rather than external helpers?
+-- 
+2.13.3
+
diff --git a/rpm.spec b/rpm.spec
index 88cd9f0..7aac188 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}36%{?dist}
+Release: %{?snapver:0.%{snapver}.}37%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
@@ -156,6 +156,8 @@ Patch335: 0059-Fix-error-handling-in-rpmio-Python-binding-test-case.patch
 Patch340: 0060-Return-error-exit-status-when-make-check-is-failed.patch
 
 # These are not yet upstream
+# Enable debugsource and debuginfo subpackages by default
+Patch900: 0001-macros-enable-debugsource-and-debuginfo-subpkgs-by-d.patch
 Patch902: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch904: rpm-4.13.90-ldflags.patch
@@ -651,6 +653,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Jul 25 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-37
+- Enable debugsource and debuginfo subpackages by default
+
 * Mon Jul 24 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.13.0.1-36
 - Make sure that test results are not ignored