diff --git a/src/_optirun b/src/_optirun
index a25424d..1678cad 100644
--- a/src/_optirun
+++ b/src/_optirun
@@ -48,16 +48,19 @@ arguments=(
     '--version[output version information]'
     '(-h --help)'{-h,--help}'[show help]'
     '(-c --vgl-compress)'{-c,--vgl-compress}'[image transport method]:method:(proxy jpeg rgb xb yuv)'
-    '--failsafe[run a program even if the nvidia card is unavailable]'
+    '--failsafe[run a program even if the nvidia card is unavailable]:boolean:(true false)'
     '--no-failsafe[do not run a program if the nvidia card is unavailable]'
     '--vgl-options[options to be passed to vglrun (example: +tr)]'
     '(-q --quiet --silent)'{-q,--quiet,--silent}'[supress all logging messages]'
     '(-v --verbose)'{-v,--verbose}'[increase the verbosity level of log messages]'
     '--debug[set the verbosity level to the maximum]'
+    '(-b --bridge)'{-b,--bridge}'[specify bridge library to use: VirtualGL, Primus or auto]:method:(auto primus virtualgl none)'
     '(-d --display)'{-d,--display}'[the X display number to use]'
     '(-C --config)'{-C,--config}'[retrieve settings for Bumblebee from FILE]:file:_files'
     '(-l --ldpath)'{-l,--ldpath}'[PATH the libraries like libGL.so are searched in]:file:_files'
+    '--primus-ldpath[a colon-separated list of paths which are searched for the primus libGL.so.1]:file:_files'
     '(-s --socket)'{-s,--socket}'[use FILE for communication with the daemon]:file:_files'
+    '--no-xorg[do not start secondary X server (implies -b none)]'
     '*::arguments: _normal'
 )