diff --git a/stella/Makefile b/stella/Makefile
index 9b3bf3869..8018a1974 100644
--- a/stella/Makefile
+++ b/stella/Makefile
@@ -13,7 +13,7 @@
 ## See the file "license" for information on usage and redistribution of
 ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ##
-## $Id: Makefile,v 1.30 2006-12-20 20:36:25 stephena Exp $
+## $Id: Makefile,v 1.31 2007-07-25 13:07:15 stephena Exp $
 ##
 ##   Based on code from ScummVM - Scumm Interpreter
 ##   Copyright (C) 2002-2004 The ScummVM project
@@ -179,9 +179,9 @@ install: all
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/mini"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/large"
-	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons"
-	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/mini"
-	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.xpm" "$(DESTDIR)$(DATADIR)/icons/large"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons/mini"
+	$(INSTALL) -c -m 644 "$(srcdir)/src/common/stella.png" "$(DESTDIR)$(DATADIR)/icons/large"
 
 install-strip: install
 	strip stella$(EXEEXT)
@@ -190,9 +190,9 @@ uninstall:
 	rm -f  "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
 	rm -rf "$(DESTDIR)$(DOCDIR)/"
 	rm -f  "$(DESTDIR)$(DATADIR)/applications/stella.desktop"
-	rm -f  "$(DESTDIR)$(DATADIR)/icons/stella.xpm"
-	rm -f  "$(DESTDIR)$(DATADIR)/icons/mini/stella.xpm"
-	rm -f  "$(DESTDIR)$(DATADIR)/icons/large/stella.xpm"
+	rm -f  "$(DESTDIR)$(DATADIR)/icons/stella.png"
+	rm -f  "$(DESTDIR)$(DATADIR)/icons/mini/stella.png"
+	rm -f  "$(DESTDIR)$(DATADIR)/icons/large/stella.png"
 
 # Special rule for Win32 icon stuff (there's probably a better way to do this ...)
 src/win32/stella_icon.o: src/win32/stella.ico src/win32/stella.rc
diff --git a/stella/src/common/stella.png b/stella/src/common/stella.png
new file mode 100644
index 000000000..5aa10bfa6
Binary files /dev/null and b/stella/src/common/stella.png differ
diff --git a/stella/src/unix/stella.desktop b/stella/src/unix/stella.desktop
index 562b369ef..67deeadb7 100644
--- a/stella/src/unix/stella.desktop
+++ b/stella/src/unix/stella.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Stella
 Comment=A multi-platform Atari 2600 emulator
 Exec=stella
-Icon=stella.xpm
+Icon=stella.png
 Terminal=false
 Type=Application
 Categories=Application;Emulator;Game;
diff --git a/stella/src/unix/stella.spec b/stella/src/unix/stella.spec
index 66953b0db..d0a660d4a 100644
--- a/stella/src/unix/stella.spec
+++ b/stella/src/unix/stella.spec
@@ -27,9 +27,7 @@ License:        GPL
 URL:            http://stella.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %_tmppath/%name-%version-%release-root
-BuildRequires:  SDL-devel
-BuildRequires:  MesaGLU-devel
-BuildRequires:  zlib-devel
+BuildRequires:  SDL-devel MesaGLU-devel zlib-devel
 
 %description
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most
@@ -90,7 +88,7 @@ make install-strip DESTDIR=%{buildroot}
 install -d -m0755 %{buildroot}%{_menudir}
 cat > %{buildroot}%{_menudir}/%{name} << EOF
 ?package(%{name}): command="stella" \
-icon="stella.xpm" \
+icon="stella.png" \
 needs="x11" \
 title="Stella" \
 longtitle="A multi-platform Atari 2600 emulator" \
@@ -114,9 +112,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %{_menudir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %_docdir/stella/*
-%_datadir/icons/%{name}.xpm
-%_datadir/icons/mini/%{name}.xpm
-%_datadir/icons/large/%{name}.xpm
+%_datadir/icons/%{name}.png
+%_datadir/icons/mini/%{name}.png
+%_datadir/icons/large/%{name}.png
 
 %changelog
 * Fri Dec 22 2006 Stephen Anthony <stephena@zarb.org> 2.3-1plf2007.0