diff --git a/riddler.install b/riddler.install
index 0b6cf9d..c7bcf94 100644
--- a/riddler.install
+++ b/riddler.install
@@ -50,4 +50,28 @@ function riddler_schema() {
     'primary key' => array('qid'),
   );
   return $schema;
-}
\ No newline at end of file
+}
+
+/**
+ * Create new table for questions and copy variable content to it.
+ */
+function riddler_update_7000() {
+  drupal_install_schema('riddler');
+  $query = db_query("SELECT name, value FROM {variable} WHERE name LIKE 'riddler_question%'");
+  $result = $query->execute();
+  $insert = db_insert('riddler_questions')->fields(array('question', 'answer'));
+  $numberOfQuestions = $query->rowCount(); 
+  if ($numberOfQuestions > 0) {
+    for ($i = 0; $i < $numberOfQuestions; $i++) {
+      $question = variable_get('riddler_question_'.$i);
+      $answer = variable_get('riddler_answer_'.$i);  
+      if (!empty($question)) {
+        $data = array('question' => $question, 'answer' => $answer);
+        $insert->values($data)->execute();
+      }
+    }
+  } else {
+    $data = array('question' => 'Do you like SPAM?', 'answer' => 'No');
+    $insert->values($data)->execute();
+  } 
+}