diff --git a/net-snmp-5.9-cflags.patch b/net-snmp-5.9-cflags.patch
index 5099cde..8e22133 100644
--- a/net-snmp-5.9-cflags.patch
+++ b/net-snmp-5.9-cflags.patch
@@ -1,19 +1,3 @@
-diff -urNp a/net-snmp-config.in b/net-snmp-config.in
---- a/net-snmp-config.in	2018-07-18 13:43:12.264426052 +0200
-+++ b/net-snmp-config.in	2018-07-18 13:52:06.917089518 +0200
-@@ -140,10 +140,10 @@ else
-       ;;
-     #################################################### compile
-     --base-cflags)
--      echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
-+      echo -I${NSC_INCLUDEDIR}
-       ;;
-     --cflags|--cf*)
--      echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
-+      echo @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR}
-       ;;
-     --srcdir)
-       echo $NSC_SRCDIR
 diff -urNp a/perl/Makefile.PL b/perl/Makefile.PL
 --- a/perl/Makefile.PL	2020-08-26 08:32:52.498909823 +0200
 +++ b/perl/Makefile.PL	2020-08-26 09:30:45.584951552 +0200
@@ -33,4 +17,4 @@ diff -urNp a/perl/MakefileSubs.pm b/perl/MakefileSubs.pm
 +	$Params->{'CCFLAGS'} =~ s/ -W(inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g;
  	append($Params->{'CCFLAGS'}, '-Wformat');
      }
- }
+ }"::
diff --git a/net-snmp.spec b/net-snmp.spec
index dc8b370..1a55f78 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -10,7 +10,7 @@
 Summary:    A collection of SNMP protocol tools and libraries
 Name:       net-snmp
 Version:    5.9.1
-Release:    6%{?dist}
+Release:    7%{?dist}
 Epoch:      1
 
 License:    BSD
@@ -121,6 +121,7 @@ Summary:  The development environment for the NET-SNMP project
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: %{name}-agent-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: elfutils-devel, rpm-devel, elfutils-libelf-devel, openssl-devel
+Requires: redhat-rpm-config
 %ifnarch s390 s390x ppc64le
 Requires: lm_sensors-devel
 %endif
@@ -495,6 +496,10 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
 %{_libdir}/libnetsnmptrapd*.so.%{soname}*
 
 %changelog
+* Thu Jul 29 2021 Josef Ridky <jridky@redhat.com> - 1:5.9.1-7
+- revert cflags modification in net-snmp-config as was reverted in upstream
+  and add proper dependency to net-snmp-devel sub-package (#1544527)
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.9.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild