diff --git a/transmission.spec b/transmission.spec
index 2280dd4..f5f88f3 100644
--- a/transmission.spec
+++ b/transmission.spec
@@ -1,6 +1,6 @@
 Name:           transmission
 Version:        1.80
-Release:        0.5.b5%{?dist}
+Release:        0.6.b5%{?dist}
 Summary:        A lightweight GTK+ BitTorrent client
 
 Group:          Applications/Internet
@@ -8,7 +8,10 @@ Group:          Applications/Internet
 License:        MIT and GPLv2
 URL:            http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}b5.tar.xz
+# This is intended to be merged by upstream post 1.80 release
 Source1:        qtr.desktop
+# init script. Upstream doesn't want it because it is distro specific
+Source2:        transmission-daemon-init
 BuildRequires:  openssl-devel >= 0.9.4
 BuildRequires:  glib2-devel >= 2.15.5
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -32,40 +35,56 @@ back-end.
 
 %package common
 Summary:       Transmission common files
+Group:         Applications/Internet
 Conflicts:     transmission < 1.80-0.3.b4
 %description common
-This package contains the common files necessary for other 
-transmission subpackages. It includes the web user interface
-icons and transmission-remote
+Common files for Transmission BitTorrent client sub-packages. It includes 
+the web user interface, icons and transmission-remote utility.
 
 %package cli
 Summary:       Transmission command line implementation
+Group:         Applications/Internet
 Requires:      transmission-common
 Provides:      transmission = %{version}-%{release}
 %description cli
-This package contains the files necessary to run the command line version of Transmission 
+Command line version of Transmission BitTorrent client.
 
 %package daemon
 Summary:       Transmission daemon
+Group:         Applications/Internet
 Requires:      transmission-common
+Requires(pre): shadow-utils
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
 Provides:      transmission = %{version}-%{release}
 %description daemon
-This package contains the files necessary to run Transmission daemon
+Transmission BitTorrent client daemon.
 
 %package gtk
 Summary:       Transmission GTK interface
+Group:         Applications/Internet
 Requires:      transmission-common
 Obsoletes:     transmission <= 1.80-0.3.b4
 Provides:      transmission = %{version}-%{release}
 
 %description gtk
-This package contains files needed for the GTK interface of Transmission.
+GTK graphical interface of Transmission BitTorrent client.
 
 %package qt
 Summary:       Transmission Qt interface
+Group:         Applications/Internet
 Requires:      transmission-common
 %description qt
-This package contains files needed for the Qt interface of Transmission.
+Qt graphical interface of Transmission BitTorrent client.
+
+%pre daemon
+getent group transmission >/dev/null || groupadd -r transmission
+getent passwd transmission >/dev/null || \
+useradd -r -g transmission -d HOMEDIR -s /sbin/nologin \
+-c "transmission daemon account" transmission
+exit 0
 
 %prep
 %setup -q -n transmission-1.80b5
@@ -77,16 +96,19 @@ make %{?_smp_mflags}
 
 pushd qt
 qmake-qt4 qtr.pro
-make
+make %{?_smp_mflags}
 popd
 
 
 %install
+mkdir -p %{buildroot}%{_initddir}
+install -m755 %{SOURCE2} %{buildroot}%{_initddir}/transmission-daemon
+mkdir -p %{buildroot}/var/lib/transmission
+
 make install DESTDIR=%{buildroot}
 
 make install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt
 
-
 %find_lang %{name}
 
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -95,11 +117,25 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1}
 %clean
 rm -rf %{buildroot}
 
+%post daemon
+/sbin/chkconfig --add transmission-daemon
+
 %post
+
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database > /dev/null 2>&1 || :
 
+%preun daemon
+if [ $1 = 0 ] ; then
+    /sbin/service transmission-daemon stop >/dev/null 2>&1
+    /sbin/chkconfig --del transmission-daemon
+fi
+
+%postun daemon
+if [ "$1" -ge "1" ] ; then
+    /sbin/service transmission-daemon condrestart >/dev/null 2>&1 || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -125,6 +161,8 @@ update-desktop-database > /dev/null 2>&1 || :
 %files daemon
 %defattr(-, root, root, -)
 %{_bindir}/transmission-daemon
+%{_initddir}/transmission-daemon
+%attr(-,transmission, transmission)/var/lib/transmission/
 %doc %{_mandir}/man1/transmission-daemon*
 
 %files gtk -f %{name}.lang
@@ -138,9 +176,12 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_bindir}/qtr
 %{_datadir}/applications/qtr.desktop
 
-
 %changelog
 
+* Wed Jan 20 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.80-0.6.b5
+- Add a initscript for transmission daemon. Fixes rhbz#556228
+- Description changes, add group for sub-packages and fix make
+
 * Thu Jan 14 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.80-0.5.b5
 - Bug fixes
 - http://trac.transmissionbt.com/wiki/Changes#version-1.80b5