diff --git a/_jmeter b/_jmeter
index 4a69b0a..ab873b5 100644
--- a/_jmeter
+++ b/_jmeter
@@ -45,17 +45,25 @@
 
 
 _arguments \
-  '(- 1 *)'{-h,--help}'[show help message]' \
-  '-p[properties files]:properties file:_files -g "*.properties"' \
-  '-n[run in non-GUI mode]' \
-  '-s[run in server mode]' \
-  '-t[name of JMX file that contains the Test Plan]:JMeter test plan file:_files -g "*.jmx"' \
-  '-l[name of JTL file to log sample results to]: :_files -g "*.jtl"' \
-  '-j[name of JMeter run log file]: :_files -g "*.log"' \
-  '-r[run the test in the servers specified by the JMeter property "remote_hosts"]' \
-  '-R[run the test in the specified remote servers]:remote servers list' \
-  '-H[proxy server hostname or ip address]: :_hosts' \
-  '-P[proxy server port]:number' \
-  '-N[nonproxy hosts]:regex' \
-  '-u[username for proxy authentication]:username:_users' \
-  '-a[password for proxy authentication]:password'
+  '(- 1 *)'{-h,--help}'[print usage information and exit]' \
+  '(- 1 *)'{-v,--version}'[print the version information and exit]' \
+  {-p,--propfile}'[the jmeter property file to use]:properties file:_files -g "*.properties"' \
+  '*'{-q,--addprop}'[additional property file(s)]:properties file:_files -g "*.properties"' \
+  {-t,--testfile}'[the jmeter test plan file to run]:JMeter test plan file:_files -g "*.jmx"' \
+  {-j,--jmeterlogfile}'[the jmeter log file]: :_files -g "*.log"' \
+  {-l,--logfile}'[the file to log samples to]: :_files -g "*.jtl"' \
+  {-n,--nongui}'[run JMeter in nongui mode]' \
+  {-s,--server}'[run the JMeter server]' \
+  {-H,--proxyHost}'[set a proxy server for JMeter to use]: :_hosts' \
+  {-P,--proxyPort}'[set proxy server port for JMeter to use]:number' \
+  {-u,--username}'[set username for proxy server that JMeter is to use]:username:_users' \
+  {-a,--password}'[set password for proxy server that JMeter is to use]:password' \
+  {-J-,--jmeterproperty}'[define additional JMeter properties]:argument=value' \
+  {-G-,--globalproperty}'[define Global properties (sent to servers)]:argument=value' \
+  {-D-,--systemproperty}'[define additional System properties]:argument=value' \
+  {-S,--systemPropertyFile}'[a property file to be added as System properties]:properties file:_files -g "*.properties"' \
+  {-L,--loglevel}'[define loglevel]:[category=]level' \
+  {-r,--runremote}'[start remote servers (as defined by the jmeter property remote_hosts)]' \
+  {-R,--remotestart}'[start these remote servers (overrides remote_hosts)]:remote servers list' \
+  {-d,--homedir}'[the JMeter home directory to use]: :_files -/' \
+  {-X,--remoteexit}'[exit the remote servers at end of test (non-GUI)]'