diff --git a/emacs.desktop b/emacs.desktop
index e6b4f8a..a239a0e 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -5,7 +5,7 @@ Comment=Edit text
 Comment[zh_TW]=編輯文字
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=emacs %f
-Icon=emacs.png
+Icon=emacs
 Type=Application
 Terminal=false
 Categories=Application;Utility;TextEditor;X-Red-Hat-Base;
diff --git a/emacs.spec b/emacs.spec
index 1773ebc..c3d351f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -439,6 +439,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/applications/emacs-terminal.desktop
 
 %changelog
+* Mon Aug 16 2010 Karel Klic <kklic@redhat.com> - 1:23.2-10
+- Removed the png extension from the Icon entry in emacs.desktop (rhbz#507231)
+
 * Wed Aug  4 2010 Karel Klic <kklic@redhat.com> - 1:23.2-9
 - Added Fedora conditionals