diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 02050416b8..a81c6d919c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -167,6 +167,7 @@
 		<li>[Fix] Permit null values for non-required integer custom profile fields and ensure zero complies with the range limits. (Bug #40925)</li>
 		<li>[Fix] Allow changing forum from select box under certain circumstances. (Bug #37525)</li>
 		<li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li>
+		<li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</li>
 		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
 		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
 		<li>[Change] Template engine now permits to a limited extent variable includes.</li>
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 0dfe3b0086..3c265d56da 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -1064,7 +1064,9 @@ function mcp_fork_topic($topic_ids)
 				'topic_bumper'				=> (int) $topic_row['topic_bumper'],
 				'poll_title'				=> (string) $topic_row['poll_title'],
 				'poll_start'				=> (int) $topic_row['poll_start'],
-				'poll_length'				=> (int) $topic_row['poll_length']
+				'poll_length'				=> (int) $topic_row['poll_length'],
+				'poll_max_options'			=> (int) $topic_row['poll_max_options'],
+				'poll_vote_change'			=> (int) $topic_row['poll_vote_change'],
 			);
 
 			$db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));