diff --git a/SOURCES/dhclient-script b/SOURCES/dhclient-script
index c2fdf0a..87bad65 100644
--- a/SOURCES/dhclient-script
+++ b/SOURCES/dhclient-script
@@ -645,12 +645,6 @@ dh6config() {
 
     case "${reason}" in
         BOUND6)
-            if  [ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] ||
-                    [ "${new_dhcp6_domain_search}" != "${old_dhcp6_domain_search}" ]; then
-                make_resolv_conf
-            fi
-
-
             if [ -z "${new_ip6_address}" ] ||
                [ -z "${new_ip6_prefixlen}" ]; then
                 exit_with_hooks 2
@@ -658,6 +652,7 @@ dh6config() {
 
             add_ipv6_addr_with_DAD
 
+            make_resolv_conf
             ;;
 
         RENEW6|REBIND6)
diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch
deleted file mode 100644
index f3e7113..0000000
--- a/SOURCES/dhcp-4.2.5-centos-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c
---- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000
-+++ dhcp-4.1.1-P1/omapip/errwarn.c      2012-08-15 14:13:05.582416057 +0000
-@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... )
-   log_error ("have been made to the base software release in order to make");
-   log_error ("it work better with this distribution.");
-   log_error ("%s", "");
--  log_error ("Please report for this software via the Red Hat Bugzilla site:");
--  log_error ("    http://bugzilla.redhat.com");
-+  log_error ("Please report for this software via the CentOS Bugs Database:");
-+  log_error ("    http://bugs.centos.org/");
-   log_error ("%s", "");
-   log_error ("exiting.");
- #endif
diff --git a/SOURCES/dhcp-statement_parser.patch b/SOURCES/dhcp-statement_parser.patch
new file mode 100644
index 0000000..2bb474b
--- /dev/null
+++ b/SOURCES/dhcp-statement_parser.patch
@@ -0,0 +1,21 @@
+diff --git a/common/parse.c b/common/parse.c
+index e78223c2..656b378b 100644
+--- a/common/parse.c
++++ b/common/parse.c
+@@ -5790,13 +5790,14 @@ int parse_X (cfile, buf, max)
+ 				skip_to_semi (cfile);
+ 				return 0;
+ 			}
+-			convert_num (cfile, &buf [len], val, 16, 8);
+-			if (len++ > max) {
++			if (len >= max) {
+ 				parse_warn (cfile,
+ 					    "hexadecimal constant too long.");
+ 				skip_to_semi (cfile);
+ 				return 0;
+ 			}
++			convert_num (cfile, &buf [len], val, 16, 8);
++			len++;
+ 			token = peek_token (&val, (unsigned *)0, cfile);
+ 			if (token == COLON)
+ 				token = next_token (&val,
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index c893632..dcdae2b 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.5
-Release:  82%{?dist}
+Release:  83%{?dist}.1
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -120,7 +120,7 @@ Patch77:  dhcp-handle_ctx_signals.patch
 Patch78:  dhcp-system_time_changed.patch
 Patch79:  dhcp-close_file_in_noreplay.patch
 Patch80:  dhcp-resize_ldap_buffer.patch
-Patch81:  dhcp-4.2.5-centos-branding.patch
+Patch81:  dhcp-statement_parser.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -471,6 +471,7 @@ rm -rf includes/isc-dhcp
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1697637
 %patch80 -p1 -b .ldap-resize
+
 %patch81 -p1
 
 
@@ -754,11 +755,11 @@ done
 
 
 %changelog
-* Tue Sep 29 2020 CentOS Sources <bugs@centos.org> - 4.2.5-82.el7.centos
-- Roll in CentOS Branding
+* Thu May 27 2021 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-83.1
+- Fix for CVE-2021-25217
 
-* Thu Jan 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-82
-- Related: #1668696 - Fix syntax error in dhclient script
+* Mon Feb 10 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-83
+- Revert fix for 1668696
 
 * Wed Jan 22 2020 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-81
 - Resolves: #1668696 - Update /etc/resolv.conf in stateless mode