diff --git a/berusky.desktop b/berusky.desktop
index 07f7f81..9420511 100644
--- a/berusky.desktop
+++ b/berusky.desktop
@@ -7,5 +7,5 @@ Exec=berusky
 StartupNotify=false
 Terminal=false
 Type=Application
-Icon=berusky.png
+Icon=berusky
 Categories=Game;LogicGame;
diff --git a/berusky.spec b/berusky.spec
index 6de9815..f43b45e 100644
--- a/berusky.spec
+++ b/berusky.spec
@@ -1,20 +1,18 @@
 Summary:        Sokoban clone
 Name:           berusky
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Amusements/Games
-Source:         http://www.anakreon.cz/download/berusky/tar.gz/%{name}-%{version}.tar.gz
+Source:         http://www.anakreon.cz/download/%{name}-%{version}.tar.gz
 Source1:        berusky.desktop
 Source2:        berusky.png
-URL:            http://www.anakreon.cz/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://www.anakreon.cz/?q=node/1
 Requires:       berusky-data >= 1.6
 Requires:       SDL SDL_image
 BuildRequires:  SDL-devel SDL_image-devel desktop-file-utils
 BuildRequires:  gtk2-devel
 
-
 %description
 Berusky is a 2D logic game based on an ancient puzzle named Sokoban.
 
@@ -34,8 +32,7 @@ This package contains a binary for the game.
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+%make_install
 
 mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
 
@@ -45,14 +42,11 @@ popd
 
 rm -rf %{buildroot}/%{_datadir}/%{name}
 
-# Install icon and desktop file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-
-desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications --add-category X-Fedora %{SOURCE1}
-
-%clean
-rm -rf %{buildroot}
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/NEWS
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
@@ -67,14 +61,24 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %files
-%defattr(-, root, root)
 %doc %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/*
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/COPYING
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/TODO
+
 %{_bindir}/berusky
-%{_datadir}/applications/fedora-berusky.desktop
+%{_datadir}/applications/berusky.desktop
 %{_datadir}/icons/hicolor/32x32/apps/berusky.png
 
 %changelog
+* Mon Feb 11 2013 Rahul Sundaram <sundaram@fedoraproject.org> - 1.6-2
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- fix url and sourceurl
+- fix desktop file to follow specification
+
 * Sat Dec 9 2012 Martin Stransky <stransky@redhat.com> 1.6-1
 - New upstream version (1.6)
 
@@ -143,4 +147,4 @@ fi
 - fixes from #237416
 
 * Fri Apr 20 2007 Martin Stransky <stransky@redhat.com> 1.0-1
-- initial build
\ No newline at end of file
+- initial build