diff --git a/mx.truffle/mx_truffle.py b/mx.truffle/mx_truffle.py
index 6771babf5bb3..8178165788d7 100644
--- a/mx.truffle/mx_truffle.py
+++ b/mx.truffle/mx_truffle.py
@@ -56,6 +56,8 @@ def sldebug(args):
     mx.run_java(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl.tools"), "com.oracle.truffle.sl.tools.debug.SLREPL"] + slArgs)
 
 def _truffle_gate_runner(args, tasks):
+    with Task('Truffle Javadoc', tasks) as t:
+        if t: mx.javadoc(['--unified'])
     with Task('Truffle UnitTests', tasks) as t:
         if t: unittest(['--suite', 'truffle', '--enable-timing', '--verbose', '--fail-fast'])
     with Task('Truffle Signature Tests', tasks) as t:
diff --git a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java
index 9578db168a0f..b1e5a8d82837 100644
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java
+++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Layout.java
@@ -86,6 +86,7 @@ public static Layout createLayout() {
      * @param objectType that describes the object instance with this shape.
      * @param sharedData for language-specific use
      * @param id for language-specific use
+     * @return new instance of a shape
      */
     public abstract Shape createShape(ObjectType objectType, Object sharedData, int id);
 
diff --git a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Property.java b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Property.java
index 76c69b0c79aa..0bb91062669f 100644
--- a/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Property.java
+++ b/truffle/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Property.java
@@ -35,7 +35,10 @@ protected Property() {
     /**
      * Create a new property.
      *
+     * @param key the key of the property
+     * @param location location of the property
      * @param flags for language-specific use
+     * @return new instance of the property
      */
     public static Property create(Object key, Location location, int flags) {
         return Layout.getFactory().createProperty(key, location, flags);