diff --git a/doc/ChangeLog b/doc/ChangeLog
index 064358369..fa7b1896b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-22  Vadim Kurland  <vadim@netcitadel.com>
 
+	* ObjectManipulator_ops.cpp (autorename): fixed #2520 "Attached
+	Network objects are not renamed if a firewall is renamed"
+
 	* AttachedNetworksDialog.cpp (addAddressToList): see #2519 Avoid
 	creating duplicate network objects for the AttachedNetwork object
 	if the parent interface has multiple ip addresses that belong to
diff --git a/src/libgui/ObjectManipulator_ops.cpp b/src/libgui/ObjectManipulator_ops.cpp
index 8b29c0962..06fad094a 100644
--- a/src/libgui/ObjectManipulator_ops.cpp
+++ b/src/libgui/ObjectManipulator_ops.cpp
@@ -123,9 +123,10 @@ void ObjectManipulator::autorename(FWObject *obj)
         list<FWObject*> ipv6_list = obj->getByType(IPv6::TYPENAME);
         list<FWObject*> pa_list = obj->getByType(physAddress::TYPENAME);
         list<FWObject*> failover_list = obj->getByType(FailoverClusterGroup::TYPENAME);
+        list<FWObject*> attached_list = obj->getByType(AttachedNetworks::TYPENAME);
 
         if (ipv4_list.size() || ipv6_list.size() || pa_list.size() ||
-            failover_list.size() || subinterfaces.size())
+            failover_list.size() || subinterfaces.size() || attached_list.size())
         {
             list<FWObject*> vlans;
             for (list<FWObject*>::iterator j=subinterfaces.begin();
@@ -146,6 +147,7 @@ void ObjectManipulator::autorename(FWObject *obj)
             autorename(ipv6_list, IPv6::TYPENAME, "ip6");
             autorename(pa_list, physAddress::TYPENAME, "mac");
             autorename(failover_list, FailoverClusterGroup::TYPENAME, "members");
+            autorename(attached_list, AttachedNetworks::TYPENAME, "attached");
         }
     }
 }