diff --git a/.gitmodules b/.gitmodules
index 7e22d7ba2e..0c388fc5a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -842,6 +842,9 @@
 [submodule "vendor/grammars/language-typelanguage"]
 	path = vendor/grammars/language-typelanguage
 	url = https://github.com/goodmind/language-typelanguage
+[submodule "vendor/grammars/language-varlink"]
+	path = vendor/grammars/language-varlink
+	url = https://github.com/varlink/language-varlink
 [submodule "vendor/grammars/language-viml"]
 	path = vendor/grammars/language-viml
 	url = https://github.com/Alhadis/language-viml
diff --git a/grammars.yml b/grammars.yml
index 4a05ec7ead..f845dadc8c 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -799,6 +799,8 @@ vendor/grammars/language-turing:
 - source.turing
 vendor/grammars/language-typelanguage:
 - source.tl
+vendor/grammars/language-varlink:
+- source.varlink
 vendor/grammars/language-viml:
 - source.vim-snippet
 - source.viml
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9bde77235a..3816935222 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -8590,6 +8590,17 @@ sed:
 templ:
   type: markup
   color: "#66D0DD"
+varlink:
+  type: programming
+  color: "#5882FA"
+  extensions:
+  - ".varlink"
+  ace_mode: text
+  tm_scope: source.varlink
+  language_id: 396563549
+wdl:
+  type: programming
+  color: "#42f1f4"
   extensions:
   - ".templ"
   ace_mode: text
diff --git a/samples/varlink/com.redhat.system.varlink b/samples/varlink/com.redhat.system.varlink
new file mode 100644
index 0000000000..b1c216674d
--- /dev/null
+++ b/samples/varlink/com.redhat.system.varlink
@@ -0,0 +1,49 @@
+#
+# Source: https://github.com/varlink/com.redhat.system/blob/master/src/com.redhat.system.varlink
+# Licenses:
+# MIT - https://github.com/varlink/com.redhat.system/blob/master/LICENSE-MIT
+# Apache - https://github.com/varlink/com.redhat.system/blob/master/LICENSE-APACHE
+#
+#
+# The Activator Interface allows to configure and maintain a list of available
+# interfaces. When an interface is accessed by a client, the activator receives
+# the initial message, starts the service which implements this interface, and
+# hands over the listening connection with the initial message.
+interface com.redhat.system
+
+type Executable (
+  path: string,
+  user_id: ?int,
+  group_id: ?int
+)
+
+type Service (
+  address: string,
+  interfaces: [string](),
+  executable: ?Executable,
+  activate_at_startup: ?bool
+)
+
+type Config (
+  vendor: string,
+  product: string,
+  version: string,
+  url: string,
+  services: []Service,
+  systems: [string]string
+)
+
+# Retrieve the current configuration.
+method GetConfig() -> (config: Config)
+
+# Add services to the list of managed services.
+method AddServices(services: []Service) -> ()
+
+# Add systems to the list of known systems.
+method AddSystems(systems: [string]string) -> ()
+
+# Remove and stop services from the list of manages services.
+method RemoveServices(services: []Service) -> ()
+
+# Remove and stop services from the list of manages services.
+method RemoveSystems(systems: []string) -> ()
diff --git a/vendor/README.md b/vendor/README.md
index 71363f19a7..65961bde86 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -597,9 +597,14 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Uno:** [dotnet/csharp-tmLanguage](https://github.com/dotnet/csharp-tmLanguage)
 - **UnrealScript:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **UrWeb:** [gwalborn/UrWeb-Language-Definition](https://github.com/gwalborn/UrWeb-Language-Definition)
+<<<<<<< HEAD
 - **V:** [0x9ef/vscode-vlang](https://github.com/0x9ef/vscode-vlang)
 - **VBA:** [serkonda7/vscode-vba](https://github.com/serkonda7/vscode-vba)
 - **VBScript:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
+=======
+- **Vala:** [technosophos/Vala-TMBundle](https://github.com/technosophos/Vala-TMBundle)
+- **varlink:** [varlink/language-varlink](https://github.com/varlink/language-varlink)
+>>>>>>> Add varlink grammar
 - **VCL:** [brandonwamboldt/sublime-varnish](https://github.com/brandonwamboldt/sublime-varnish)
 - **VHDL:** [textmate/vhdl.tmbundle](https://github.com/textmate/vhdl.tmbundle)
 - **Vala:** [technosophos/Vala-TMBundle](https://github.com/technosophos/Vala-TMBundle)
diff --git a/vendor/grammars/language-varlink b/vendor/grammars/language-varlink
new file mode 160000
index 0000000000..dcc59cf3a3
--- /dev/null
+++ b/vendor/grammars/language-varlink
@@ -0,0 +1 @@
+Subproject commit dcc59cf3a377b68bfea8e55274973c8d426ffc52
diff --git a/vendor/licenses/grammar/language-varlink.txt b/vendor/licenses/grammar/language-varlink.txt
new file mode 100644
index 0000000000..475f303112
--- /dev/null
+++ b/vendor/licenses/grammar/language-varlink.txt
@@ -0,0 +1,27 @@
+---
+type: grammar
+name: language-varlink
+license: mit
+---
+
+MIT License
+
+Copyright (c) 2018 Harald Hoyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.