diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 7bc5587..559a9b6 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -381,6 +381,20 @@ function poll_validate($node) {
 }
 
 /**
+ * Implementation of hook_nodeapi().
+ */
+function poll_nodeapi(&$node, $op, $teaser, $page) {
+  switch ($op) {
+    case 'prepare translation':
+      if ($node->type == 'poll') {
+        // Set initial values for the choices to those of the node being translated.
+        $node->choice = $node->translation_source->choice;
+      }
+      break;
+  }
+}
+
+/**
  * Implementation of hook_load().
  */
 function poll_load($node) {