diff --git a/comicpress-options.php b/comicpress-options.php
index 39d857f..9389d13 100644
--- a/comicpress-options.php
+++ b/comicpress-options.php
@@ -79,7 +79,8 @@ function comicpress_admin() {
 				'disable_comic_frontpage',
 				'disable_comic_blog_frontpage',
 				'disable_comic_blog_single',
-				'disable_blog_frontpage'
+				'disable_blog_frontpage',
+				'enable_random_comic_frontpage'
 				) as $key) {
 					$comicpress_options[$key] = (bool)( $_REQUEST[$key] == 1 ? true : false );
 			}
diff --git a/functions.php b/functions.php
index 8cb8f6d..8a44865 100644
--- a/functions.php
+++ b/functions.php
@@ -144,6 +144,7 @@ function comicpress_load_options() {
 			'cp_theme_layout' => 'standard',
 			'transcript_in_posts' => false,
 			'enable_widgetarea_use_sidebar_css' => false,
+			'enable_random_comic_frontpage' => false,
 
 			'enable_custom_image_header' => false,
 			'custom_image_header_width' => '980',
diff --git a/index.php b/index.php
index e15a22a..27918b6 100644
--- a/index.php
+++ b/index.php
@@ -3,13 +3,16 @@
 
 <?php if (!$comicpress_options['disable_comic_frontpage'] && !$comicpress_options['disable_comic_blog_frontpage'] && !is_paged() )  {
 	Protect();
-	$comic_query = '&showposts=1&cat='.get_all_comic_categories_as_cat_string();
-	$posts = query_posts($comic_query);
+	global $frontpage_postnum;
+	if (isset($frontpage_postnum)) {
+		$post = & get_post( $frontpage_postnum ); 
+	} else {
+		$comic_query = '&showposts=1&cat='.get_all_comic_categories_as_cat_string();
+		$posts = query_posts($comic_query);
+	}
 	$wp_query->is_archive = false;
 	if (have_posts()) {
-		while (have_posts()) : the_post();
-			comicpress_display_post();
-		endwhile; 
+		comicpress_display_post();
 	}
 	Restore(); 
 	UnProtect(); 
diff --git a/layout-head.php b/layout-head.php
index 88dfeba..e8fd9d2 100644
--- a/layout-head.php
+++ b/layout-head.php
@@ -22,10 +22,16 @@
 <?php 
 	if (!$comicpress_options['disable_comic_frontpage'] && is_home()) {
 		Protect();
-		$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
+		if ($comicpress_options['enable_random_comic_frontpage'] && is_home()) {
+			$comic_query = 'showposts=1&orderby=rand&cat='.get_all_comic_categories_as_cat_string();
+		} else {
+			$comic_query = 'showposts=1&cat='.get_all_comic_categories_as_cat_string();
+		}
 		$posts = query_posts($comic_query);
 		if (have_posts()) {
 			while (have_posts()) : the_post();
+				global $frontpage_postnum;
+				$frontpage_postnum = $post->ID;
 				$wp_query->is_single = true;
 				comicpress_display_comic_area();
 			endwhile;
diff --git a/options/indexoptions.php b/options/indexoptions.php
index aec0f3f..e5fa730 100644
--- a/options/indexoptions.php
+++ b/options/indexoptions.php
@@ -64,6 +64,15 @@
 						<?php _e('Checkmark this and the blog portion of the comic will not display on the single/archive pages of your site.','comicpress'); ?>
 					</td>
 				</tr>
+				<tr>
+					<th scope="row"><label for="enable_random_comic_frontpage"><?php _e('Have it so that the index/front page shows a random comic each pageload?','comicpress'); ?></label></th>
+					<td>
+						<input id="enable_random_comic_frontpage" name="enable_random_comic_frontpage" type="checkbox" value="1" <?php checked(true, $comicpress_options['enable_random_comic_frontpage']); ?> />
+					</td>
+					<td>
+						<?php _e('When this is checkmarked, the front page will display a random comic from the archive.','comicpress'); ?>
+					</td>
+				</tr>
 			</table>
 
 		</div>