diff --git a/putty.changes b/putty.changes
index 9663500..8f0a313 100644
--- a/putty.changes
+++ b/putty.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 13 13:21:36 UTC 2015 - aj@ajaissle.de
+
+- Build icons and add a .desktop file for putty
+
 -------------------------------------------------------------------
 Mon Mar  2 10:19:15 UTC 2015 - jengelh@inai.de
 
diff --git a/putty.spec b/putty.spec
index e463526..11b72c4 100644
--- a/putty.spec
+++ b/putty.spec
@@ -31,8 +31,10 @@ Source2:        http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz
 Source4:        %name.keyring
 Patch1:         putty-03-config.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  ImageMagick
 BuildRequires:  gtk2-devel
 BuildRequires:  krb5-devel
+BuildRequires:  update-desktop-files
 Conflicts:      pssh
 
 %description
@@ -46,19 +48,53 @@ serial console client.
 
 %build
 %configure
-make %{?_smp_mflags};
+make %{?_smp_mflags}
+make %{?_smp_mflags} -C icons cicons pngs
 
 %install
 %make_install
+b="%buildroot"
+mkdir -p "$b/%_datadir/applications/"
+cat >"$b/%_datadir/applications/%name.desktop" <<-EOF
+	[Desktop Entry]
+	Name=PuTTY SSH Client
+	GenericName=PuTTY
+	Comment=Connect to an SSH server with PuTTY
+	Exec=putty
+	Icon=putty
+	Terminal=false
+	Type=Application
+	Categories=GTK;Network;RemoteAccess;
+EOF
+
+%suse_update_desktop_file -n %name
+
+mkdir -p "$b/%_datadir/pixmaps/"
+install -m644 icons/xpmpterm.c "$b/%_datadir/pixmaps/pterm.xpm"
+install -m644 icons/xpmputty.c "$b/%_datadir/pixmaps/putty.xpm"
+install -m644 icons/pterm-32.png "$b/%_datadir/pixmaps/pterm.png"
+install -m644 icons/putty-32.png "$b/%_datadir/pixmaps/putty.png"
 
 %check
 make check
 
+%if 0%{?suse_version} >= 1140
+%post
+%desktop_database_post
+%endif
+
+%if 0%{?suse_version} >= 1140
+%postun
+%desktop_database_postun
+%endif
+
 %files
 %defattr(-,root,root)
-%doc LICENCE
-%_bindir/*
-%doc %_mandir/man*/*
-%doc doc/*.html
+%doc LICENCE doc/*.html
+%doc %{_mandir}/man*/*
+%{_bindir}/*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*.xpm
 
 %changelog