diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9136dcf8..c1e880216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 ### Updates
+#### -> 1.39.0
+* Startup optimization. Startup for ghprb will be split into a pool size of 5 threads, which
+can be overridden via JVM args.
 
 #### -> 1.38.0
 * Add ability to decide whether to build based on regions (or repository file paths as defined by regex)
diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 000000000..91956223c
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,7 @@
+Frequently Asked Questions
+=====
+
+**Q: Startup seems slow. What can I do?**
+
+A: A poolsize is set for 5 threads by default. This can be overridden with a 
+JVM arg: `-Dorg.jenkinsci.plugins.ghprb.GhprbTrigger.poolSize=5`
diff --git a/README.md b/README.md
index 1cd2e0123..d16fa5504 100644
--- a/README.md
+++ b/README.md
@@ -197,3 +197,7 @@ job('downstreamJob') {
 ### Updates
 
 See [CHANGELOG](CHANGELOG.md)
+
+### FAQ
+
+See [FAQ](FAQ.md)