diff --git a/Makefile.am b/Makefile.am
index 861b3d2f..263c34f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,9 @@ if HAVE_GNOME
 desktopdir = $(datadir)/gnome/apps/Internet
 desktop_DATA = irssi.desktop
 
+pixmapsdir=$(datadir)/pixmaps
+pixmaps_DATA=irssi-icon.png
+
 corbadir = $(sysconfdir)/CORBA/servers
 corba_DATA = irssi.gnorba
 endif
@@ -37,8 +40,9 @@ EXTRA_DIST = \
 	file2header.sh \
 	irssi.spec \
 	$(conf_DATA) \
-	irssi.gnorba \
-	irssi.desktop
+	$(pixmaps_DATA) \
+	$(corba_DATA) \
+	$(desktop_DATA)
 
 ## make rpms
 rpm: Makefile
diff --git a/irssi-icon.png b/irssi-icon.png
new file mode 100644
index 00000000..dd5efd20
Binary files /dev/null and b/irssi-icon.png differ
diff --git a/irssi.desktop b/irssi.desktop
index b65ee375..d76aa6a3 100644
--- a/irssi.desktop
+++ b/irssi.desktop
@@ -2,6 +2,7 @@
 Name=irssi
 Comment=irssi IRC client
 Comment[pl]=irssi - klient IRC
+Icon=irssi-icon.png
 Exec=irssi
 Terminal=0
 Type=Application