diff --git a/esound.spec b/esound.spec
index 6e75338..08731bb 100644
--- a/esound.spec
+++ b/esound.spec
@@ -1,20 +1,21 @@
 # Note that this is NOT a relocatable package
 Summary: Allows several audio streams to play on a single audio device
 Name:    esound
-Version: 0.2.41
-Release: 8%{?dist}
 Epoch:   1
+Version: 0.2.41
+Release: 9%{?dist}
 License: LGPLv2+
-URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
-Group: System Environment/Daemons
-Source0:  http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch4: esound-0.2.38-drain.patch
-Patch6: esound-0.2.38-fix-open-macro.patch
-Patch7: remove-confusing-spew.patch
+Group:   System Environment/Daemons
+URL:     ftp://ftp.gnome.org/pub/GNOME/sources/esound
+
+Source0: http://ftp.gnome.org/pub/gnome/sources/esound/0.2/esound-%{version}.tar.bz2
+Patch4:  esound-0.2.38-drain.patch
+Patch6:  esound-0.2.38-fix-open-macro.patch
+Patch7:  remove-confusing-spew.patch
 # default to nospawn, so we can kill the esd.conf file
-Patch8: esound-nospawn.patch
-Patch9: esound-0.2.41-libm.patch
+Patch8:  esound-nospawn.patch
+Patch9:  esound-0.2.41-libm.patch
+
 # temporarily disable doc build due to xml catalog issues
 #BuildRequires: docbook-utils
 BuildRequires: audiofile-devel
@@ -63,6 +64,23 @@ Requires: automake
 The esound-devel package includes the libraries, include files and
 other resources needed to develop EsounD applications.
 
+%package daemon
+Summary: EsounD daemon
+Group: System Environment/Daemons
+
+%description daemon
+EsounD, the Enlightened Sound Daemon, is a server process that mixes
+several audio streams for playback by a single audio device. For
+example, if you're listening to music on a CD and you receive a
+sound-related event from IM client, the two applications won't have to
+queue for the use of your sound card.
+The daemon functionality was replaced with PulseAudio (PA) and the binary
+was dropped from Fedora in October 2007. However, on PA-disabled systems
+the daemon functionality was completely missing and therefore
+reintroduced to Fedora in June 2013 in form of subpackage.
+The daemon cannot run on PA-enabled systems.
+
+
 %prep
 %setup -q
 
@@ -79,25 +97,19 @@ autoreconf -v -i -f
 EGREP='grep -E' make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/esd.conf
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-# Delete the esound binary
-rm -f $RPM_BUILD_ROOT%{_bindir}/esd $RPM_BUILD_ROOT%{_mandir}/man1/esd.1*
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %doc AUTHORS COPYING.LIB ChangeLog docs/esound.sgml
 %doc NEWS README TIPS TODO
-%defattr(-, root, root,-)
 %{_libdir}/*.so.*
 
 %files tools
@@ -123,7 +135,6 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %doc %{_datadir}/doc/esound
 
 %files devel
-%defattr(-, root, root,-)
 %{_bindir}/esd-config
 %{_includedir}/*
 %{_datadir}/aclocal/*
@@ -131,7 +142,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 %{_mandir}/man1/esd-config.1.gz
 
+%files daemon
+%{_bindir}/esd
+%{_mandir}/man1/esd.1.gz
+
 %changelog
+* Wed Jun 05 2013 Jaromir Capik <jcapik@redhat.com> - 1:0.2.41-9
+- Reintroducing the daemon (#879700)
+- Cleaning the spec
+- Fixing bogus dates in the changelog
+
 * Thu Feb 07 2013 Jon Ciesla <limburgher@gmail.com> 1:0.2.41-8
 - Merge review fixes, BZ 225734.
 
@@ -286,7 +306,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt
 
-* Tue Dec 02 2002 Elliot Lee <sopwith@redhat.com> 0.2.28-2
+* Mon Dec 02 2002 Elliot Lee <sopwith@redhat.com> 0.2.28-2
 - Remove unpackaged files
 
 * Wed Aug 21 2002 Elliot Lee <sopwith@redhat.com> 0.2.28-1
@@ -341,7 +361,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 - Bump release + rebuild.
 
-* Tue Nov 30 2000  Elliot Lee <sopwith@redhat.com> 0.2.22-1
+* Thu Nov 30 2000  Elliot Lee <sopwith@redhat.com> 0.2.22-1
 - Update to 0.2.22
 
 * Tue Oct 3 2000  Elliot Lee <sopwith@redhat.com> 0.2.20-1