diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
index fcf411a..d7f8dba 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
@@ -8,7 +8,10 @@ process:
   nid: nid
   vid: vid
   type: type
-  langcode: language
+  langcode:
+    plugin: default_value
+    source: language
+    default_value: "und"
   title: title
   uid: uid
   status: status
@@ -21,6 +24,9 @@ process:
     migration: d6_filter_format
     source: format
   'body/value': body
+  revision_uid: uid
+  revision_log: log
+  revision_timestamp: timestamp
 
 #  unmapped d6 fields.
 #  tnid
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
index ff2bab1..824e611 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml
@@ -8,7 +8,10 @@ process:
   nid: nid
   vid: vid
   type: type
-  langcode: language
+  langcode:
+    plugin: default_value
+    source: language
+    default_value: "und"
   title: title
   uid: uid
   status: status
@@ -21,6 +24,10 @@ process:
     migration: d6_filter_format
     source: format
   'body/value': body
+  'body/summary': teaser
+  revision_uid: uid
+  revision_log: log
+  revision_timestamp: timestamp
 
 #  unmapped d6 fields.
 #  tnid
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php
index 4c0edcd..55a244a 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php
@@ -50,6 +50,8 @@ public function query() {
         'title',
         'body',
         'teaser',
+        'log',
+        'timestamp',
         'format',
       ));
     $query->innerJoin('node', 'n', static::JOIN);
@@ -75,7 +77,6 @@ public function fields() {
       'promote' => $this->t('Promoted to front page'),
       'sticky' => $this->t('Sticky at top of lists'),
       'revision' => $this->t('Create new revision'),
-      'log' => $this->t('Revision Log message'),
       'language' => $this->t('Language (fr, en, ...)'),
       'tnid' => $this->t('The translation set id for this node'),
     );
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
index 87907d3..264adaa 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -26,7 +26,11 @@ class NodeRevision extends Node {
    */
   public function fields() {
     // Use all the node fields plus the vid that identifies the version.
-    return parent::fields() + array('vid' => t('The primary identifier for this version.'));
+    return parent::fields() + array(
+      'vid' => t('The primary identifier for this version.'),
+      'log' => $this->t('Revision Log message'),
+      'timestamp' => $this->t('Revision timestamp'),
+    );
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php
index 04a4ad5..3ce530e 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6NodeRevision.php
@@ -31,10 +31,21 @@ public function load() {
         'vid' => 2,
         'uid' => 1,
         'title' => 'Test title rev 2',
-        'body' => 'test rev 2',
-        'teaser' => 'test rev 2',
+        'body' => 'body test rev 2',
+        'teaser' => 'teaser test rev 2',
         'log' => '',
-        'timestamp' => 1390095701,
+        'timestamp' => 1390095702,
+        'format' => 1,
+      ))
+      ->values(array(
+        'nid' => 1,
+        'vid' => 4,
+        'uid' => 1,
+        'title' => 'Test title rev 3',
+        'body' => 'body test rev 3',
+        'teaser' => 'teaser test rev 3',
+        'log' => 'modified rev 3',
+        'timestamp' => 1390095703,
         'format' => 1,
       ))
       ->execute();
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
index 65b6e7b..44447dd 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
@@ -45,7 +45,20 @@ public function testNodeRevision() {
     $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
     $this->assertEqual($node->id(), 1);
     $this->assertEqual($node->getRevisionId(), 2);
-    $this->assertEqual($node->body->value, 'test rev 2');
+    $this->assertEqual($node->langcode->value, 'und');
+    $this->assertEqual($node->title->value, 'Test title rev 2');
+    $this->assertEqual($node->body->value, 'body test rev 2');
+    $this->assertEqual($node->body->summary, 'teaser test rev 2');
+    $this->assertEqual($node->revision_uid->target_id, 1);
+    $this->assertEqual($node->revision_log->value, '');
+    $this->assertEqual($node->revision_timestamp->value, '1390095702');
+
+    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(4);
+    $this->assertEqual($node->id(), 1);
+    $this->assertEqual($node->body->value, 'body test rev 3');
+    $this->assertEqual($node->revision_uid->target_id, 1);
+    $this->assertEqual($node->revision_log->value, 'modified rev 3');
+    $this->assertEqual($node->revision_timestamp->value, '1390095703');
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
index b3562d1..26d0c62 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
@@ -38,6 +38,7 @@ public function setUp() {
   public function testNode() {
     $node = node_load(1);
     $this->assertEqual($node->id(), 1, 'Node 1 loaded.');
+    $this->assertEqual($node->langcode->value, 'und');
     $this->assertEqual($node->body->value, 'test');
     $this->assertEqual($node->body->format, 'filtered_html');
     $this->assertEqual($node->getType(), 'story', 'Node has the correct bundle.');
@@ -45,7 +46,11 @@ public function testNode() {
     $this->assertEqual($node->getCreatedTime(), 1388271197, 'Node has the correct created time.');
     $this->assertEqual($node->isSticky(), FALSE);
     $this->assertEqual($node->getOwnerId(), 1);
-    //$this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.');
+    $this->assertEqual($node->getRevisionCreationTime(), 1390095701, 'Node has the correct revision timestamp.');
+
+    $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1);
+    $this->assertEqual($node_revision->revision_uid->target_id, 1, 'Node revision has the correct user');
+    $this->assertEqual($node_revision->revision_log->value, '', 'Node revision has the correct log message');
 
     // It is pointless to run the second half from MigrateDrupal6Test.
     if (empty($this->standalone)) {
diff --git a/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php b/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
index e3f5fa6..7cd1d9b 100644
--- a/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
+++ b/core/modules/migrate_drupal/tests/src/source/d6/NodeTest.php
@@ -51,6 +51,8 @@ class NodeTest extends MigrateSqlSourceTestCase {
       // Node revision fields.
       'body' => 'body for node 1',
       'teaser' => 'teaser for node 1',
+      'log' => '',
+      'timestamp' => 1279051598,
       'format' => 1,
     ),
     array(
@@ -73,6 +75,8 @@ class NodeTest extends MigrateSqlSourceTestCase {
       // Node revision fields.
       'body' => 'body for node 2',
       'teaser' => 'teaser for node 2',
+      'log' => '',
+      'timestamp' => 1279308993,
       'format' => 1,
     ),
     array(
@@ -95,6 +99,8 @@ class NodeTest extends MigrateSqlSourceTestCase {
       // Node revision fields.
       'body' => 'body for node 5',
       'teaser' => 'body for node 5',
+      'log' => '',
+      'timestamp' => 1279308993,
       'format' => 1,
     ),
   );
@@ -104,7 +110,7 @@ class NodeTest extends MigrateSqlSourceTestCase {
    */
   protected function setUp() {
     foreach ($this->expectedResults as $k => $row) {
-      foreach (array('nid', 'vid', 'title', 'uid', 'body', 'teaser', 'format') as $i => $field) {
+      foreach (array('nid', 'vid', 'title', 'uid', 'body', 'teaser', 'log', 'timestamp', 'format') as $i => $field) {
         $this->databaseContents['node_revisions'][$k][$field] = $row[$field];
         // Keep nid and vid.
         if ($i > 1) {