diff --git a/bacula-bat.desktop b/bacula-bat.desktop
index 3b450e7..92b0506 100644
--- a/bacula-bat.desktop
+++ b/bacula-bat.desktop
@@ -5,7 +5,7 @@ Name=Bacula Bat Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=/usr/sbin/bat -c /etc/bacula/bat.conf
-Icon=bat_icon
+Icon=bat
 Terminal=false
 Type=Application
 Categories=System;Application;Utility
diff --git a/bacula-traymonitor.desktop b/bacula-traymonitor.desktop
new file mode 100644
index 0000000..98cf021
--- /dev/null
+++ b/bacula-traymonitor.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Bacula Monitor
+GenericName=Bacula Tray Monitor
+Comment=Monitor your Bacula Backup server
+Exec=/usr/bin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
+Icon=bacula-tray-monitor
+Terminal=false
+Type=Application
+Categories=System;Application;Utility
diff --git a/bacula.spec b/bacula.spec
index 8ef0e6e..906ce8d 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -18,6 +18,7 @@ Source10:		bacula-fd.service
 Source11:		bacula-dir.service
 Source12:		bacula-sd.service
 Source13:		bacula-bat.desktop
+Source14:		bacula-traymonitor.desktop
 Source15:		bacula-fd.sysconfig
 Source16:		bacula-dir.sysconfig
 Source17:		bacula-sd.sysconfig
@@ -73,7 +74,7 @@ or damaged files.
 Summary:		Bacula libraries
 Group:			System Environment/Daemons
 Requires(pre):		fedora-usermgmt
-Obsoletes:		bacula-console-gnome <= 2.4, bacula-traymonitor <= 2.4
+Obsoletes:		bacula-console-gnome <= 2.4
 Obsoletes:		bacula-sysconfdir <= 2.4, bacula-console-wxwidgets <= 5.0.3
 
 %description libs
@@ -88,8 +89,7 @@ This package contains basic Bacula libraries.
 Summary:		Common Bacula files
 Group:			System Environment/Daemons
 Requires(pre):		fedora-usermgmt
-Obsoletes:		bacula-console-gnome <= 2.4, bacula-traymonitor <= 2.4
-Obsoletes:		bacula-sysconfdir <= 2.4, bacula-console-wxwidgets <= 5.0.3
+Obsoletes:		bacula-sysconfdir <= 2.4
 
 %description common
 Bacula is a set of programs that allow you to manage the backup,
@@ -264,6 +264,19 @@ recovery, and verification of computer data across a network of
 different computers. It is based on a client/server architecture.
 
 This package contains the bat version of the bacula management console.
+
+
+%package traymonitor
+Summary:		Bacula system tray monitor
+Group:			System Environment/Daemons
+
+%description traymonitor
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package contains the Gnome and KDE compatible tray monitor to 
+monitor your bacula server.
 %endif
 
 
@@ -407,10 +420,17 @@ rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
 
 mkdir -p %{buildroot}%{_bindir}
 
-# Bat
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
+# Bat
+install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
+
+# QT Tray monitor
+install -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
+install -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
+install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
+
 %else
 rm -f %{buildroot}%{_mandir}/man1/bat.1*
 %endif
@@ -805,7 +825,14 @@ fi
 %{_sbindir}/bat
 %{_mandir}/man1/bat.1.gz
 %{_datadir}/applications/fedora-bacula-bat.desktop
-%{_datadir}/pixmaps/bat_icon.png
+%{_datadir}/pixmaps/bat.png
+
+%files traymonitor
+%defattr(-,root,root,-)
+%{_sbindir}/bacula-tray-monitor
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
+%{_datadir}/applications/fedora-bacula-traymonitor.desktop
+%{_datadir}/pixmaps/bacula-tray-monitor.png
 %endif
 
 %files docs
@@ -835,6 +862,7 @@ fi
 - Default permissions on bconsole and bat.
 - Use localhost as default on config files instead of patching fake
   example.com hostnames.
+- Add QT tray monitor.
 
 * Sat Dec 10 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-10
 - Added patch for mysql 5.5.18 from Oliver Falk.