diff --git a/inc/jetpack.php b/inc/jetpack.php
index fda2615b..172afb81 100644
--- a/inc/jetpack.php
+++ b/inc/jetpack.php
@@ -27,7 +27,7 @@ function _s_jetpack_setup() {
 
 	// Add theme support for Content Options.
 	add_theme_support( 'jetpack-content-options', array(
-		'post-details' => array(
+		'post-details'    => array(
 			'stylesheet' => '_s-style',
 			'date'       => '.posted-on',
 			'categories' => '.cat-links',
@@ -35,6 +35,11 @@ function _s_jetpack_setup() {
 			'author'     => '.byline',
 			'comment'    => '.comments-link',
 		),
+		'featured-images' => array(
+			'archive'    => true,
+			'post'       => true,
+			'page'       => true,
+		),
 	) );
 }
 add_action( 'after_setup_theme', '_s_jetpack_setup' );
diff --git a/inc/template-tags.php b/inc/template-tags.php
index e4b9cf02..0ff12f1d 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -100,3 +100,36 @@ function _s_entry_footer() {
 	);
 }
 endif;
+
+if ( ! function_exists( '_s_post_thumbnail' ) ) :
+/**
+ * Displays an optional post thumbnail.
+ *
+ * Wraps the post thumbnail in an anchor element on index views, or a div
+ * element when on single views.
+ */
+function _s_post_thumbnail() {
+	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+		return;
+	}
+
+	if ( is_singular() ) :
+	?>
+
+	<div class="post-thumbnail">
+		<?php the_post_thumbnail(); ?>
+	</div><!-- .post-thumbnail -->
+
+	<?php else : ?>
+
+	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
+		<?php
+			the_post_thumbnail( 'post-thumbnail', array(
+				'alt' => the_title_attribute( 'echo=0' ),
+			) );
+		?>
+	</a>
+
+	<?php endif; // End is_singular().
+}
+endif;
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index 0c8ad09b..a3c1f10b 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -14,6 +14,8 @@
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content();
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index b7ac2ff9..80ce08b5 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -20,6 +20,8 @@
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 6e3b38f0..8ffc61a5 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -26,6 +26,8 @@
 		endif; ?>
 	</header><!-- .entry-header -->
 
+	<?php _s_post_thumbnail(); ?>
+
 	<div class="entry-content">
 		<?php
 			the_content( sprintf(