diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0cd4f718b1adf94763be6bc7d6db1280778716bc..182b7d1e098c1a9b0898f8dbc3b52577ed0b93af 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacs.desktop: New file.
+
 2007-11-30  Kentaro Ohkouchi  <nanasess@fsm.ne.jp>
 
 	* images/icons/macemacs_16.png, images/icons/macemacs_24.png:
diff --git a/etc/emacs.desktop b/etc/emacs.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..630d3c78834eb5f29305888b562a321d73a416ec
--- /dev/null
+++ b/etc/emacs.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Emacs
+GenericName=Text Editor
+Comment=Edit text
+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_32.png
+Type=Application
+Terminal=false
+Categories=Application;Development;TextEditor;
+Encoding=UTF-8
+StartupWMClass=Emacs