diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef65d9d..8367fec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### New Features
 
 - Add `noline` grammar statement to skip emitting `#line` directives
+- Attempt to autodetect target language (D/C++) in extra/vim/syntax/propane.vim
 
 ### Fixes
 
diff --git a/extra/vim/syntax/propane.vim b/extra/vim/syntax/propane.vim
index 74f8378..add52ff 100644
--- a/extra/vim/syntax/propane.vim
+++ b/extra/vim/syntax/propane.vim
@@ -8,7 +8,11 @@ if exists("b:current_syntax")
 endif
 
 if !exists("b:propane_subtype")
-  let b:propane_subtype = "d"
+  if search('\<import\s\+\%(std\|core\)\.', 'nw') > 0
+    let b:propane_subtype = "d"
+  else
+    let b:propane_subtype = "cpp"
+  endif
 endif
 
 exe "syn include @propaneTarget syntax/".b:propane_subtype.".vim"