diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html
index 8c8b805975..234ec5a42b 100644
--- a/phpBB/adm/style/acp_bbcodes.html
+++ b/phpBB/adm/style/acp_bbcodes.html
@@ -31,11 +31,11 @@
 	</fieldset>
 
 	<fieldset>
-		<legend>{L_BBCODE_HELPLINE}</legend>
-		<p>{L_BBCODE_HELPLINE_EXPLAIN}</p>
+		<legend>{{ lang('BBCODE_HELPLINE') }}</legend>
+		<p>{{ lang('BBCODE_HELPLINE_EXPLAIN') }}</p>
 	<dl>
-		<dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt>
-		<dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd>
+		<dt><label for="bbcode_helpline">{{ lang('BBCODE_HELPLINE_TEXT') }}</label></dt>
+		<dd><textarea id="bbcode_helpline" name="bbcode_helpline" cols="60" rows="4">{{ BBCODE_HELPLINE }}</textarea></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 3c0371a3a7..719aa4881a 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -235,7 +235,7 @@ class acp_bbcodes
 						trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
 					}
 
-					if (strlen($bbcode_helpline) > 255)
+					if (strlen($bbcode_helpline) > 3000)
 					{
 						trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
 					}
diff --git a/phpBB/phpbb/db/migration/data/v33x/extend_bbcode_tooltip.php b/phpBB/phpbb/db/migration/data/v33x/extend_bbcode_tooltip.php
new file mode 100644
index 0000000000..d2f1a78062
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/extend_bbcode_tooltip.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v33x;
+
+class extend_bbcode_tooltip extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'bbcodes', 'bbcode_helpline');
+	}
+
+	static public function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v334'
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'change_columns'	=> [
+				$this->table_prefix . 'bbcodes'	=> [
+					'bbcode_helpline'	=> ['TEXT_UNI', ''],
+				],
+			],
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'change_columns'	=> [
+				$this->table_prefix . 'bbcodes'	=> [
+					'bbcode_helpline'	=> ['VCHAR_UNI', ''],
+				],
+			],
+		];
+	}
+}