diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..05f80d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+/results*
+/*.src.rpm
+/wingpanel-indicator-sound-2.0.3.tar.xz
+/wingpanel-indicator-sound-2.0.4.tar.gz
+/wingpanel-indicator-sound-2.0.5.tar.gz
+/wingpanel-indicator-sound-2.1.0.tar.gz
+/wingpanel-indicator-sound-2.1.1.tar.gz
+/wingpanel-indicator-sound-2.1.2.tar.gz
+/wingpanel-indicator-sound-2.1.3.tar.gz
+/wingpanel-indicator-sound-2.1.4.tar.gz
+/wingpanel-indicator-sound-2.1.5.tar.gz
+/wingpanel-indicator-sound-2.1.6.tar.gz
+/wingpanel-indicator-sound-2.1.7.tar.gz
+/wingpanel-indicator-sound-2.1.8.tar.gz
+/wingpanel-indicator-sound-845e631.tar.gz
+/wingpanel-indicator-sound-6.0.0.tar.gz
+/wingpanel-indicator-sound-6.0.1.tar.gz
diff --git a/00-fix-appdata-xml-syntax.patch b/00-fix-appdata-xml-syntax.patch
new file mode 100644
index 0000000..81c616f
--- /dev/null
+++ b/00-fix-appdata-xml-syntax.patch
@@ -0,0 +1,14 @@
+diff --git a/data/sound.appdata.xml.in b/data/sound.appdata.xml.in
+index 21a7e8e..fb27735 100644
+--- a/data/sound.appdata.xml.in
++++ b/data/sound.appdata.xml.in
+@@ -10,7 +10,9 @@
+     <release version="6.0.0" date="2021-07-14" urgency="medium">
+       <description>
+         <p>New features</p>
++        <ul>
+           <li>select specific input and output devices</li>
++        </ul>
+         <p>Minor updates</p>
+         <ul>
+           <li>Hide temporary audio players when they stop</li>
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..e5add1c
--- /dev/null
+++ b/changelog
@@ -0,0 +1,107 @@
+* Fri Feb 19 2021 Fabio Valentini <decathorpe@gmail.com> - 2.1.8-3.20210217git845e631
+- Bump to commit 845e631. Rebuilt for granite 6 soname bump and wingpanel 3.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 07 2021 Fabio Valentini <decathorpe@gmail.com> - 2.1.8-1
+- Update to version 2.1.8.
+
+* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 2.1.7-1
+- Update to version 2.1.7.
+
+* Wed Aug 12 2020 Fabio Valentini <decathorpe@gmail.com> - 2.1.6-1
+- Update to version 2.1.6.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Apr 03 2020 Fabio Valentini <decathorpe@gmail.com> - 2.1.5-1
+- Update to version 2.1.5.
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov 25 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.4-1
+- Update to version 2.1.4.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Mar 07 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.3-1
+- Update to version 2.1.3.
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Dec 19 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-1
+- Update to version 2.1.2.
+
+* Mon Oct 01 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.1-1
+- Update to version 2.1.1.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 05 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-1
+- Update to version 2.1.0.
+
+* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.0.5-7
+- Rebuild for granite5 soname bump.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 24 2018 Fabio Valentini <decathorpe@gmail.com> - 2.0.5-5
+- Add patch to fix undefined symbols.
+
+* Sat Nov 04 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.5-4
+- Rebuild for granite soname bump.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed May 03 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.5-1
+- Update to version 2.0.5.
+
+* Sat Apr 22 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.4-1
+- Update to version 2.0.4.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.3-4
+- Remove explicit BR: pkgconfig.
+
+* Sat Jan 14 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.3-3
+- Filter provides.
+
+* Fri Jan 13 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.3-2
+- Clean up spec file.
+
+* Mon Oct 31 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.3-1
+- Update to version 2.0.3.
+
+* Tue Oct 04 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-1
+- Update to version 2.0.2.
+
+* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-3
+- Mass rebuild.
+
+* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-2
+- Spec file cleanups.
+
+* Sun Sep 11 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-1
+- Update to version 2.0.1.
+
+* Sun Aug 21 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0-1
+- Update to latest snapshot.
+
+* Sun Aug 21 2016 Fabio Valentini <decathorpe@gmail.com>
+- Weak inverse require wingpanel.
+
+* Sun Aug 21 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0-1
+- Update to version 2.0.
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 43a9af6..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-remove package (temporarily) due to unresolved issues with GNOME 43
diff --git a/sources b/sources
new file mode 100644
index 0000000..a33c0c3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (wingpanel-indicator-sound-6.0.1.tar.gz) = aa34e5a695f0f89dd602aa6033f36f85c8dea26407c86f368f8c49f0d1879a56afa466dda079e557b5a868307087461d92dc8c138b9e12702ee39c42b433d60b
diff --git a/wingpanel-indicator-sound.rpmlintrc b/wingpanel-indicator-sound.rpmlintrc
new file mode 100644
index 0000000..fbcdc48
--- /dev/null
+++ b/wingpanel-indicator-sound.rpmlintrc
@@ -0,0 +1,3 @@
+# false positives
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
diff --git a/wingpanel-indicator-sound.spec b/wingpanel-indicator-sound.spec
new file mode 100644
index 0000000..ab832a1
--- /dev/null
+++ b/wingpanel-indicator-sound.spec
@@ -0,0 +1,71 @@
+%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$
+
+%global srcname wingpanel-indicator-sound
+%global appname io.elementary.wingpanel.sound
+
+Name:           wingpanel-indicator-sound
+Summary:        Sound Indicator for wingpanel
+Version:        6.0.1
+Release:        %autorelease
+License:        GPLv3
+
+URL:            https://github.com/elementary/%{name}
+Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0
+
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libcanberra)
+BuildRequires:  pkgconfig(libcanberra-gtk)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libpulse-mainloop-glib)
+BuildRequires:  pkgconfig(wingpanel) >= 3.0.0
+
+Requires:       wingpanel%{?_isa}
+Supplements:    wingpanel%{?_isa}
+
+%description
+A sound indicator for wingpanel.
+
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang sound-indicator
+
+# remove the specified stock icon from appdata (invalid in libappstream-glib)
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+
+
+%check
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+
+
+%files -f sound-indicator.lang
+%doc README.md
+%license COPYING
+
+%{_libdir}/wingpanel/libsound.so
+
+%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.sound.gschema.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
+
+
+%changelog
+%autochangelog