--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Tue Mar 15 13:48:30 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Thu Mar 17 19:04:28 2016 +0000
@@ -39,20 +39,34 @@
     Output source locations where deprecated APIs are used
 javac.opt.classpath=\
     Specify where to find user class files and annotation processors
+javac.opt.modulepath=\
+    Specify where to find application modules
 javac.opt.sourcepath=\
     Specify where to find input source files
+javac.opt.m=\
+    Compile only the specified module, check timestamps
+javac.opt.modulesourcepath=\
+    Specify where to find input source files for multiple modules
 javac.opt.bootclasspath=\
     Override location of bootstrap class files
+javac.opt.system=\
+    Override location of system modules
+javac.opt.upgrademodulepath=\
+    Override location of upgradeable modules
 javac.opt.Xbootclasspath.p=\
     Prepend to the bootstrap class path
 javac.opt.Xbootclasspath.a=\
     Append to the bootstrap class path
+javac.opt.Xpatch=\
+    Specify location of module class files to patch
 javac.opt.endorseddirs=\
     Override location of endorsed standards path
 javac.opt.extdirs=\
     Override location of installed extensions
 javac.opt.processorpath=\
     Specify where to find annotation processors
+javac.opt.processormodulepath=\
+    Specify a module path where to find annotation processors
 javac.opt.processor=\
     Names of the annotation processors to run; bypasses default discovery process
 javac.opt.parameters=\
@@ -95,6 +109,12 @@
     key[=value]
 javac.opt.arg.path=\
     <path>
+javac.opt.arg.mspath=\
+    <module-source-path>
+javac.opt.arg.m=\
+    <module-name>
+javac.opt.arg.jdk=\
+    <jdk>|none
 javac.opt.arg.dirs=\
     <dirs>
 javac.opt.arg.directory=\
@@ -252,6 +272,29 @@
     Read options and filenames from file
 javac.opt.diags=\
     Select a diagnostic mode
+javac.opt.addExports=\n\
+\        Specify a package to be considered as exported from its defining module\n\
+\        to additional modules, or to all unnamed modules if <other-module> is ALL-UNNAMED.
+javac.opt.arg.addExports=\
+    <module>/<package>=<other-module>(,<other-module>)*
+javac.opt.addReads=\n\
+\        Specify additional modules to be considered as required by a given module.\n\
+\        <other-module> may be ALL-UNNAMED to require the unnamed module.
+javac.opt.arg.addReads=\
+    <module>=<other-module>(,<other-module>)*
+javac.opt.module=\
+    Specify a module to which the classes being compiled belong.
+javac.opt.arg.module=\
+    <module-name>
+javac.opt.addmods=\n\
+\        Root modules to resolve in addition to the initial modules, or all modules\n\
+\        on the module path if <module> is ALL-MODULE-PATH.
+javac.opt.arg.addmods=\
+    <module>(,<module>)*
+javac.opt.limitmods=\
+    Limit the universe of observable modules
+javac.opt.arg.limitmods=\
+    <module>(,<module>)*
 
 ## errors
 
@@ -269,6 +312,10 @@
     invalid profile: {0}
 javac.err.invalid.target=\
     invalid target release: {0}
+javac.err.option.not.allowed.with.target=\
+    option {0} not allowed with target {1}
+javac.err.option.too.many=\
+    option {0} can only be specified once
 javac.err.no.source.files=\
     no source files
 javac.err.no.source.files.classes=\
@@ -279,6 +326,8 @@
     invalid source release: {0}
 javac.err.error.writing.file=\
     error writing {0}; {1}
+javac.err.sourcepath.modulesourcepath.conflict=\
+    cannot specify both -sourcepath and -modulesourcepath
 javac.warn.source.target.conflict=\
     source release {0} requires target release {1}
 javac.warn.target.default.source.conflict=\