diff --git a/syntax_checkers/vhdl/ghdl.vim b/syntax_checkers/vhdl/ghdl.vim
index 929867cb..57faa9de 100644
--- a/syntax_checkers/vhdl/ghdl.vim
+++ b/syntax_checkers/vhdl/ghdl.vim
@@ -19,7 +19,10 @@ function! SyntaxCheckers_vhdl_ghdl_IsAvailable()
 endfunction
 
 function! SyntaxCheckers_vhdl_ghdl_GetLocList()
-    let makeprg = 'ghdl -s '.shellescape(expand('%'))
+    let makeprg = syntastic#makeprg#build({
+                \ 'exe': 'ghdl',
+                \ 'args': '-s',
+                \ 'subchecker': 'ghdl' })
     let errorformat =  '%f:%l:%c: %m'
 
     return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })