diff --git a/avahi.spec b/avahi.spec
index f5bb155..6fdf9e7 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,7 +3,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          5
+Release:          6
 Summary:          Avahi is a local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -17,8 +17,8 @@ Patch3:           0003-fix-requires-in-pc-file.patch
 Patch4:           0004-fix-bytestring-decoding-for-proper-display.patch
 Patch5:           0005-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch
 
-Patch6000:        backport-CVE-2021-3468.patch
-Patch6001:        backport-CVE-2021-36217.patch
+Patch6001:        backport-CVE-2021-3468.patch
+Patch6002:        backport-CVE-2021-36217.patch
 
 BuildRequires:    gcc automake libtool desktop-file-utils gtk2-devel glib2-devel
 BuildRequires:    libcap-devel expat-devel gdbm-devel
@@ -86,6 +86,18 @@ Requires:         gtk2
 %description ui
 This package contains a Gtk 2.x widget for browsing services.
 
+%package autoipd
+Summary:          Link-local IPv4 address automatic configuration daemon (IPv4LL)
+Requires(pre):    shadow-utils
+Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
+ 
+%description autoipd
+avahi-autoipd implements IPv4LL, "Dynamic Configuration of IPv4
+Link-Local Addresses"  (IETF RFC3927), a protocol for automatic IP address
+configuration from the link-local 169.254.0.0/16 range without the need for a
+central server. It is primarily intended to be used in ad-hoc networks which
+lack a DHCP server.
+
 %package dnsconfd
 Summary:          This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS
 Requires:         %{name} = %{version}-%{release}
@@ -175,6 +187,16 @@ Requires:         %{name}-glib = %{version}-%{release}
 %description gobject
 This library contains a GObject wrapper for the Avahi API
 
+%package gobject-devel
+Summary:          Libraries and header files for Avahi GObject development
+Requires:         %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:         %{name}-gobject%{?_isa} = %{version}-%{release}
+#Requires:         %{name}-glib-devel = %{version}-%{release}
+ 
+%description gobject-devel
+The avahi-gobject-devel package contains the header files and libraries
+necessary for developing programs using avahi-gobject.
+
 %package ui-gtk3
 Summary:          Gtk user interface library for Avahi (Gtk+ 3 version)
 Requires:         %{name}-libs = %{version}-%{release}
@@ -375,7 +397,6 @@ fi
 %license LICENSE
 
 %{_sbindir}/avahi-daemon
-%{_sbindir}/avahi-autoipd
 %dir %{_libdir}/avahi
 %if %{WITH_PYTHON}
 %{_libdir}/avahi/service-types.db
@@ -393,7 +414,6 @@ fi
 %config(noreplace) %{_sysconfdir}/avahi/hosts
 %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
-%config(noreplace) %{_sysconfdir}/avahi/avahi-autoipd.action
 
 %dir %{_sysconfdir}/avahi/services
 %ghost %dir %{_localstatedir}/run/avahi-daemon
@@ -408,6 +428,11 @@ fi
 %exclude %{_sysconfdir}/avahi/services/ssh.service
 %exclude %{_sysconfdir}/avahi/services/sftp-ssh.service
 
+%files autoipd
+%{_sbindir}/avahi-autoipd
+%config(noreplace) %{_sysconfdir}/avahi/avahi-autoipd.action
+%attr(1770,avahi-autoipd,avahi-autoipd) %dir %{_localstatedir}/lib/avahi-autoipd/
+
 %files libs
 %doc README
 %license LICENSE
@@ -421,6 +446,11 @@ fi
 %files gobject
 %{_libdir}/libavahi-gobject.so.*
 
+%files gobject-devel
+%{_libdir}/libavahi-gobject.so
+%{_includedir}/avahi-gobject
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
 %files ui-gtk3
 %{_libdir}/libavahi-ui-gtk3.so.*
 
@@ -436,9 +466,7 @@ fi
 %{_libdir}/libavahi-core.so
 %{_libdir}/libavahi-client.so
 %{_libdir}/libavahi-glib.so
-%{_libdir}/libavahi-gobject.so
 %{_libdir}/libavahi-libevent.so
-%{_libdir}/pkgconfig/avahi-gobject.pc
 %{_libdir}/pkgconfig/avahi-glib.pc
 %{_libdir}/pkgconfig/avahi-core.pc
 %{_libdir}/pkgconfig/avahi-client.pc
@@ -522,7 +550,10 @@ fi
 %{_mandir}/man8/*
 
 %changelog
-* Wed Jul 14 2021 liuyumeng <liuyumeng1@huawei.com> - 0.8-5
+* Tue Sep 02 2021 wangkerong <wangkerong@huawei.com> - 0.8-6
+- Add autopid,gobject-devel subpackages
+
+* Thu Jul 15 2021 liuyumeng <liuyumeng5@huawei.com> - 0.8-5
 - Type:CVE
 - ID:CVE-2021-36217
 - SUG:NA