diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd161f80..e27a437a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 This is the Changelog for the vim-airline project.
 
 ## [Unreleased]
+- New features
+  - Extensions:
+    - [Defx](https://github.com/Shougo/defx.nvim) support
 
 ## [0.10] - 2018-12-15
 - New features
diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 1857dfd4..726e9839 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -217,6 +217,10 @@ function! airline#extensions#load()
     let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
   endif
 
+  if exists(':Defx')
+    let s:filetype_overrides['defx'] = ['defx', '%{b:defx.paths[0]}']
+  endif
+
   if get(g:, 'airline#extensions#branch#enabled', 1) && (
           \ airline#util#has_fugitive() ||
           \ airline#util#has_lawrencium() ||