diff --git a/autoload/UltiSnips.vim b/autoload/UltiSnips.vim
index 6000ff0c..8545d6d7 100644
--- a/autoload/UltiSnips.vim
+++ b/autoload/UltiSnips.vim
@@ -117,8 +117,19 @@ function! UltiSnips#JumpForwards()
 endfunction
 
 function! UltiSnips#FileTypeChanged()
+    let ft = &ft
+    if exists('b:is_django')
+        " Additional filetypes for django-plus.vim
+        if ft =~# '\<python\>'
+            let ft = 'django.' . ft
+        elseif ft =~# '\<django\>'
+            let ft = 'htmldjango.' . ft
+        elseif ft =~# '\<htmldjango\>'
+            let ft .= '.html'
+        endif
+    endif
     exec g:_uspy "UltiSnips_Manager.reset_buffer_filetypes()"
-    exec g:_uspy "UltiSnips_Manager.add_buffer_filetypes('" . &ft . "')"
+    exec g:_uspy "UltiSnips_Manager.add_buffer_filetypes('" . ft . "')"
     return ""
 endfunction