diff --git a/colors/gruvbox.vim b/colors/gruvbox.vim
index f38ae122..a7151d5c 100644
--- a/colors/gruvbox.vim
+++ b/colors/gruvbox.vim
@@ -41,8 +41,8 @@ endif
 if !exists('g:gruvbox_underline')
 	let g:gruvbox_underline=1
 endif
-if !exists('g:gruvbox_foreground_guisp')
-	let g:gruvbox_foreground_guisp=0
+if !exists('g:gruvbox_guisp_fallback') || index(['fg', 'bg'], g:gruvbox_guisp_fallback) == -1
+	let g:gruvbox_guisp_fallback='none'
 endif
 
 if !exists('g:gruvbox_italicize_comments')
@@ -232,7 +232,7 @@ function! s:HL(group, fg, ...)
 	let histring = 'hi ' . a:group . ' '
 
 	" if (Foreground override enabled) && (    We were passed a guisp value     )
-	if g:gruvbox_foreground_guisp != 0 && a:0 >= 3 && strlen(a:3) && a:3 != 'none'
+	if g:gruvbox_guisp_fallback == 'fg' && a:0 >= 3 && strlen(a:3) && a:3 != 'none'
 		let c = get(s:gb, a:3)
 		let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' '
 	elseif strlen(a:fg)
@@ -248,7 +248,11 @@ function! s:HL(group, fg, ...)
 		endif
 	endif
 
-	if a:0 >= 1 && strlen(a:1)
+	" if (Background override enabled) && (    We were passed a guisp value     )
+	if g:gruvbox_guisp_fallback == 'bg' && a:0 >= 3 && strlen(a:3) && a:3 != 'none'
+		let c = get(s:gb, a:3)
+		let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' '
+	elseif a:0 >= 1 && strlen(a:1)
 		if a:1 == 'bg'
 			let histring .= 'guibg=bg ctermbg=bg '
 		elseif a:fg == 'fg'