diff --git a/dhclient-script b/dhclient-script
index 05e4205..4bea304 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -320,12 +320,22 @@ execute_client_side_configuration_scripts() {
 
 flush_dev() {
 # Instead of bringing the interface down (#574568)
-# explicitly clear the ARP cache and flush all addresses & routes.
+# explicitly clear ARP cache and flush all addresses & routes.
     ip -4 addr flush dev ${1} >/dev/null 2>&1
     ip -4 route flush dev ${1} >/dev/null 2>&1
     ip -4 neigh flush dev ${1} >/dev/null 2>&1
 }
 
+remove_old_addr() {
+    if [ -n "${old_ip_address}" ]; then
+        if [ -n "${old_prefix}" ]; then
+            ip -4 addr del ${old_ip_address}/${old_prefix} dev ${interface} >/dev/null 2>&1
+        else
+            ip -4 addr del ${old_ip_address} dev ${interface} >/dev/null 2>&1
+        fi
+    fi
+}
+
 dhconfig() {
     if [ -n "${old_ip_address}" ] && [ -n "${alias_ip_address}" ] &&
        [ ! "${alias_ip_address}" = "${old_ip_address}" ]; then
@@ -695,8 +705,9 @@ case "${reason}" in
         # ensure interface is up
         ip link set dev ${interface} up
 
-        # remove any stale addresses from aborted clients
-        ip -6 addr flush dev ${interface} scope global permanent
+        # aborted client cleans after itself since 4.2.6
+        # so the following is not needed anymore
+        #ip -6 addr flush dev ${interface} scope global permanent
 
         exit_with_hooks 0
         ;;
@@ -752,10 +763,10 @@ case "${reason}" in
             ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1
         fi
 
-        if [ -n "${old_ip_address}" ]; then
-            # Delete addresses/routes/arp cache.
-            flush_dev ${interface}
-        fi
+        # upstream script sets interface down here,
+        # we only remove old ip address
+        #flush_dev ${interface}
+        remove_old_addr
 
         if [ -n "${alias_ip_address}" ]; then
             ip -4 addr add ${alias_ip_address}/${alias_prefix} broadcast ${alias_broadcast_address} dev ${interface} label ${interface}:0
@@ -781,7 +792,8 @@ case "${reason}" in
                 exit_with_hooks 0
             fi
 
-            flush_dev ${interface}
+            #flush_dev ${interface}
+            remove_old_addr
             exit_with_hooks 1
         else
             exit_with_hooks 1
diff --git a/dhcp.spec b/dhcp.spec
index e0e2efa..6d2b61e 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.0
-Release:  4%{?dist}
+Release:  5%{?dist}
 # 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.
@@ -603,6 +603,9 @@ done
 
 
 %changelog
+* Wed Feb 19 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-5
+- dhclient-script: don't flush all addresses, just the used one
+
 * Tue Feb 18 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.0-4
 - IPoIB: add GUID/DUID to dhcpd logs (#1064416)