diff --git a/_config.php b/_config.php
index 2ff9ffe..f18ff31 100644
--- a/_config.php
+++ b/_config.php
@@ -1,4 +1,4 @@
 <?php
 
-Object::add_extension('Page', 'VersionFeed');
-Object::add_extension('ContentController', 'VersionFeed_Controller');
+SiteTree::add_extension('VersionFeed');
+ContentController::add_extension('VersionFeed_Controller');
diff --git a/code/VersionFeed.php b/code/VersionFeed.php
index 8695d5f..693fcd5 100644
--- a/code/VersionFeed.php
+++ b/code/VersionFeed.php
@@ -63,7 +63,9 @@ class VersionFeed extends SiteTreeExtension {
 			$previous = $version;
 		}
 
-		if ($fullHistory && $previous) {
+		// Push the first version on to the list - only if we're looking at the full history or if it's the first
+		// version in the version history.
+		if ($previous && ($fullHistory || $versions->count() == 1)) {
 			$first = clone($previous);
 			$first->DiffContent = new HTMLText();
 			$first->DiffContent->setValue('<div>' . $first->obj('Content')->forTemplate() . '</div>');