diff --git a/src/main/java/io/vertx/core/net/KeyCertOptions.java b/src/main/java/io/vertx/core/net/KeyCertOptions.java
index 05350761b70..093fcc33642 100644
--- a/src/main/java/io/vertx/core/net/KeyCertOptions.java
+++ b/src/main/java/io/vertx/core/net/KeyCertOptions.java
@@ -69,4 +69,13 @@ static KeyCertOptions wrap(X509KeyManager keyManager) {
     return new KeyManagerFactoryOptions(keyManager);
   }
 
+  /**
+   * Returns a {@link KeyCertOptions} from the provided {@link KeyManagerFactory}
+   *
+   * @param keyManagerFactory the keyManagerFactory instance
+   * @return the {@link KeyCertOptions}
+   */
+  static KeyCertOptions wrap(KeyManagerFactory keyManagerFactory) {
+    return new KeyManagerFactoryOptions(keyManagerFactory);
+  }
 }
diff --git a/src/main/java/io/vertx/core/net/KeyManagerFactoryOptions.java b/src/main/java/io/vertx/core/net/KeyManagerFactoryOptions.java
index 2fbc4eeb3e3..a991de53349 100644
--- a/src/main/java/io/vertx/core/net/KeyManagerFactoryOptions.java
+++ b/src/main/java/io/vertx/core/net/KeyManagerFactoryOptions.java
@@ -39,7 +39,11 @@
  *
  * As this class is not available because it is part of the internal api the proper usage would be:
  * <pre>
+ * // with a KeyManager
  * options.setKeyCertOptions(KeyCertOptions.wrap(keyManager));
+ *
+ * // with a KeyManagerFactory
+ * options.setKeyCertOptions(KeyCertOptions.wrap(keyManagerFactory));
  * </pre>
  *
  * @author <a href="mailto:hakangoudberg@hotmail.com">Hakan Altindag</a>
diff --git a/src/main/java/io/vertx/core/net/TrustManagerFactoryOptions.java b/src/main/java/io/vertx/core/net/TrustManagerFactoryOptions.java
index 59e974ec83b..f76b0a2b228 100644
--- a/src/main/java/io/vertx/core/net/TrustManagerFactoryOptions.java
+++ b/src/main/java/io/vertx/core/net/TrustManagerFactoryOptions.java
@@ -39,7 +39,11 @@
  *
  * As this class is not available because it is part of the internal api the proper usage would be:
  * <pre>
+ * // with a TrustManager
  * options.setTrustOptions(TrustOptions.wrap(trustManager));
+ *
+ * // with a TrustManagerFactory
+ * options.setTrustOptions(TrustOptions.wrap(trustManagerFactory));
  * </pre>
  *
  * @author <a href="mailto:hakangoudberg@hotmail.com">Hakan Altindag</a>
diff --git a/src/main/java/io/vertx/core/net/TrustOptions.java b/src/main/java/io/vertx/core/net/TrustOptions.java
index 324dcb30610..fec02675810 100644
--- a/src/main/java/io/vertx/core/net/TrustOptions.java
+++ b/src/main/java/io/vertx/core/net/TrustOptions.java
@@ -63,4 +63,13 @@ static TrustOptions wrap(TrustManager trustManager) {
     return new TrustManagerFactoryOptions(trustManager);
   }
 
+  /**
+   * Returns a {@link TrustOptions} from the provided {@link TrustManagerFactory}
+   *
+   * @param trustManagerFactory the trustManagerFactory instance
+   * @return the {@link TrustOptions}
+   */
+  static TrustOptions wrap(TrustManagerFactory trustManagerFactory) {
+    return new TrustManagerFactoryOptions(trustManagerFactory);
+  }
 }