diff --git a/.gitmodules b/.gitmodules
index 19fb9472..1816e097 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -337,6 +337,9 @@
 [submodule "vendor/grammars/ini.tmbundle"]
 	path = vendor/grammars/ini.tmbundle
 	url = https://github.com/textmate/ini.tmbundle
+[submodule "vendor/grammars/desktop.tmbundle"]
+	path = vendor/grammars/desktop.tmbundle
+	url = https://github.com/Mailaender/desktop.tmbundle.git
 [submodule "vendor/grammars/io.tmbundle"]
 	path = vendor/grammars/io.tmbundle
 	url = https://github.com/textmate/io.tmbundle
diff --git a/grammars.yml b/grammars.yml
index e446a8fa..9c9d7e35 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -170,6 +170,8 @@ vendor/grammars/dart-sublime-bundle:
 - source.dart
 - source.pubspec
 - text.dart-doccomments
+vendor/grammars/desktop.tmbundle:
+- source.desktop
 vendor/grammars/diff.tmbundle:
 - source.diff
 vendor/grammars/dylan.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 8b5c1525..1b314384 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -812,9 +812,11 @@ Emacs Lisp:
   - emacs
   filenames:
   - .emacs
+  - .emacs.desktop
   extensions:
   - .el
   - .emacs
+  - .emacs.desktop
   ace_mode: lisp
 
 EmberScript:
@@ -3305,6 +3307,14 @@ Zimpl:
   tm_scope: none
   ace_mode: text
 
+desktop:
+  type: data
+  extensions:
+  - .desktop
+  - .desktop.in
+  tm_scope: source.desktop
+  ace_mode: text
+
 eC:
   type: programming
   search_term: ec
diff --git a/samples/Emacs Lisp/.emacs.desktop b/samples/Emacs Lisp/.emacs.desktop
new file mode 100644
index 00000000..499e44bb
--- /dev/null
+++ b/samples/Emacs Lisp/.emacs.desktop	
@@ -0,0 +1,29 @@
+;; -*- mode: emacs-lisp; coding: emacs-mule; -*-
+;; --------------------------------------------------------------------------
+;; Desktop File for Emacs
+;; --------------------------------------------------------------------------
+;; Created Sat Jan  3 12:46:35 2015
+;; Desktop file format version 206
+;; Emacs version 24.3.1
+
+;; Global section:
+(setq desktop-missing-file-warning nil)
+(setq tags-file-name nil)
+(setq tags-table-list nil)
+(setq search-ring nil)
+(setq regexp-search-ring nil)
+(setq register-alist nil)
+(setq file-name-history nil)
+
+;; Buffer section -- buffers listed in same order as in buffer list:
+(desktop-create-buffer 206
+  "/home/foo/bar"
+  "bar"
+  'fundamental-mode
+  nil
+  11572
+  '(11554 nil)
+  nil
+  nil
+  '((buffer-file-coding-system . undecided-unix)))
+
diff --git a/samples/desktop/example.desktop b/samples/desktop/example.desktop
new file mode 100644
index 00000000..81221d99
--- /dev/null
+++ b/samples/desktop/example.desktop
@@ -0,0 +1,21 @@
+# http://standards.freedesktop.org/desktop-entry-spec/latest/apa.html
+
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Foo Viewer
+Comment=The best viewer for Foo objects available!
+TryExec=fooview
+Exec=fooview %F
+Icon=fooview
+MimeType=image/x-foo;
+Actions=Gallery;Create;
+
+[Desktop Action Gallery]
+Exec=fooview --gallery
+Name=Browse Gallery
+
+[Desktop Action Create]
+Exec=fooview --create-new
+Name=Create a new Foo!
+Icon=fooview-new
\ No newline at end of file
diff --git a/vendor/grammars/desktop.tmbundle b/vendor/grammars/desktop.tmbundle
new file mode 160000
index 00000000..34f9b8ab
--- /dev/null
+++ b/vendor/grammars/desktop.tmbundle
@@ -0,0 +1 @@
+Subproject commit 34f9b8ab985ff7d981661f632eeff6d6c080cea8