diff --git a/quassel.desktop b/quassel.desktop
index 7f13157..8842eba 100644
--- a/quassel.desktop
+++ b/quassel.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Quassel IRC
 Exec=quassel
-Icon=default
+Icon=quassel
 Terminal=false
 Type=Application
 Categories=Qt;Network;IRCClient;
diff --git a/quassel.png b/quassel.png
new file mode 100644
index 0000000..941a0d8
Binary files /dev/null and b/quassel.png differ
diff --git a/quassel.spec b/quassel.spec
index 16a6e01..4ff65ee 100755
--- a/quassel.spec
+++ b/quassel.spec
@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: QT4 Based distrubuted IRC system
 Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
@@ -10,6 +10,7 @@ Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
 Source1: %{name}.desktop
 Source2: %{name}core.desktop
 Source3: %{name}client.desktop
+Source4: %{name}.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: qt-sqlite, openssl
@@ -54,6 +55,7 @@ install -d -m755 %{buildroot}%{_bindir}
 install -m755 quassel %{buildroot}%{_bindir}
 install -m755 quasselclient %{buildroot}%{_bindir}
 install -m755 quasselcore %{buildroot}%{_bindir}
+%{__install} -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
@@ -67,20 +69,26 @@ rm -rf %{buildroot}
 %attr(755,root,root) %{_bindir}/quassel
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
 %{_datadir}/applications/fedora-quassel.desktop
+%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
 
 %files core
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselcore
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
 %{_datadir}/applications/fedora-quasselcore.desktop
+%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
 
 %files client
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/quasselclient
 %doc COPYING gpl-2.0.txt gpl-3.0.txt README
 %{_datadir}/applications/fedora-quasselclient.desktop
+%attr(644,root,root) %{_datadir}/pixmaps/quassel.png
 
 %changelog
+* Mon Dec 29 2008 Steven M. Parrish <tuxbrewr@fedoraproject.org> 0.3.1-2
+- Fix bug #477850
+
 * Fri Nov 28 2008 Steven M. Parrish <smparrish@shallowcreek.net> 0.3.1-1
 - New upstream release
 
diff --git a/quasselclient.desktop b/quasselclient.desktop
index c022d06..497ca37 100644
--- a/quasselclient.desktop
+++ b/quasselclient.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Quassel client
 Exec=quasselclient
-Icon=default
+Icon=quassel
 Terminal=false
 Type=Application
 Categories=Qt;Network;IRCClient;
diff --git a/quasselcore.desktop b/quasselcore.desktop
index e130ea8..a33435d 100644
--- a/quasselcore.desktop
+++ b/quasselcore.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Quassel IRC Core
 Exec=quasselcore
-Icon=default
+Icon=quassel
 Terminal=false
 Type=Application
 Categories=Qt;Network;IRCClient;