diff --git a/doc/lua_api.md b/doc/lua_api.md
index b08f7356d881..80041e8849d0 100644
--- a/doc/lua_api.md
+++ b/doc/lua_api.md
@@ -2683,6 +2683,7 @@ Version History
 * Formspec version 7 (5.8.0):
   * style[]: Add focused state for buttons
   * Add field_enter_after_edit[] (experimental)
+* Formspec version 8 (5.9.0)
 
 Elements
 --------
@@ -2774,7 +2775,10 @@ Elements
     `scrollbar name` times `scroll factor` along the orientation `orientation` and
   * be clipped to the rectangle defined by `X`, `Y`, `W` and `H`.
 * `orientation`: possible values are `vertical` and `horizontal`.
-* `scroll factor`: optional, defaults to `0.1`.
+* `scroll factor`: (optional), multiplicator for the associated scrollbar scroll position.
+  * Defaults to `0.1`.
+  * `auto` will calculate the multiplicator based on the contents
+     * Requires formspec version >= 8.
 * Nesting is possible.
 * Some elements might work a little different if they are in a scroll_container.
 * Note: If you want the scroll_container to actually work, you also need to add a
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 4d9900ea09a9..aa42d77d1b02 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -244,7 +244,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                             // base64-encoded SHA-1 (27+\0).
 
 // See also formspec [Version History] in doc/lua_api.md
-#define FORMSPEC_API_VERSION 7
+#define FORMSPEC_API_VERSION 8
 
 #define TEXTURENAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.-"