diff --git a/compiler/ForceCli.vim b/compiler/ForceCli.vim
index 5799e8f..f2f4a19 100644
--- a/compiler/ForceCli.vim
+++ b/compiler/ForceCli.vim
@@ -13,4 +13,4 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
 endif
 
 set errorformat+=%*[\"]%f%*[\"]\\,\ line\ %l:\ %m
-CompilerSet makeprg=force\ push\ %
+CompilerSet makeprg=force\ push\ -f\ %
diff --git a/plugin/ForceCli.vim b/plugin/ForceCli.vim
index 4ceffb2..c86f04b 100644
--- a/plugin/ForceCli.vim
+++ b/plugin/ForceCli.vim
@@ -21,7 +21,7 @@ endif
 function! ForceDeploy()
     let filePath = expand("%")
 
-    let command = "force push \"" . filePath . "\""
+    let command = "force push -f \"" . filePath . "\""
     call ForceTryStart(command)
 
 endfunction
@@ -171,4 +171,19 @@ if g:force_disable_airline != 1 && g:loaded_airline == 1 && g:force_status_line_
     let g:force_status_line_func_added = 1
 endif
 
+" Neomake support
+let g:neomake_apex_force_push_maker = {
+            \ 'exe': 'force',
+            \ 'args': ['push', '-f'],
+            \ 'errorformat': &errorformat,
+            \ }
+let g:neomake_apex_force_test_maker = {
+            \ 'exe': 'echo',
+            \ 'args': ['test', '%:t:r', '||'],
+            \ 'errorformat': &errorformat,
+            \ }
+let g:neomake_visualforce_force_push_maker = g:neomake_apex_force_push_maker
+let g:neomake_apex_enabled_makers = ['force_push']
+let g:neomake_visualforce_enabled_makers = ['force_push']
+
 " Plugin Functions }