--- eutils.eclass	2007-11-18 02:06:50.000000000 +0100
+++ eutils.eclass	2007-11-18 02:32:44.000000000 +0100
@@ -741,7 +741,7 @@
 
 	local exec=${1}
 	local name=${2:-${PN}}
-	local icon=${3:-${PN}.png}
+	local icon=${3:-${PN}}
 	local type=${4}
 	local path=${5}
 
@@ -875,18 +875,18 @@
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
-	Encoding=UTF-8
 	Version=1.0
 	Name=${name}
 	Type=Application
 	Comment=${DESCRIPTION}
 	Exec=${exec}
 	TryExec=${exec%% *}
-	Path=${path}
 	Icon=${icon}
 	Categories=${type};
 	EOF
 
+	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
+
 	(
 		# wrap the env here so that the 'insinto' call
 		# doesn't corrupt the env of the caller
@@ -938,7 +938,6 @@
 
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
-	Encoding=UTF-8
 	Name=${title}
 	Comment=This session logs you into ${title}
 	Exec=${command}