diff --git a/partials/archive-page-nav.inc b/partials/archive-page-nav.inc
index d28497a..0739832 100644
--- a/partials/archive-page-nav.inc
+++ b/partials/archive-page-nav.inc
@@ -1,5 +1,7 @@
-<div class="pagenav">
-  <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
-  <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
-  <div class="clear"></div>
-</div>
+<?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+  <div class="pagenav">
+    <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
+    <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
+    <div class="clear"></div>
+  </div>
+<?php } ?>
\ No newline at end of file
diff --git a/partials/index-page-nav.inc b/partials/index-page-nav.inc
index b3e5e36..c212bd9 100644
--- a/partials/index-page-nav.inc
+++ b/partials/index-page-nav.inc
@@ -1,5 +1,7 @@
-<div class="pagenav">
-  <div class="pagenav-right"><?php previous_posts_link(__('Newer Entries &uarr;', 'comicpress')) ?></div>
-  <div class="pagenav-left"><?php next_posts_link(__('&darr; Previous Entries', 'comicpress')) ?></div>
-  <div class="clear"></div>
-</div>  
+<?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+  <div class="pagenav">
+    <div class="pagenav-right"><?php previous_posts_link(__('Newer Entries &uarr;', 'comicpress')) ?></div>
+    <div class="pagenav-left"><?php next_posts_link(__('&darr; Previous Entries', 'comicpress')) ?></div>
+    <div class="clear"></div>
+  </div>  
+<?php } ?>
\ No newline at end of file
diff --git a/search-transcript.php b/search-transcript.php
index 3fc36d8..540a925 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -46,11 +46,13 @@
 
     <?php endwhile; ?>
 
-    <div class="pagenav">
-      <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
-      <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
-      <div class="clear"></div>
-    </div>
+    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+      <div class="pagenav">
+        <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
+        <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
+        <div class="clear"></div>
+      </div>
+    <?php } ?>
 
   <?php else : ?>
 
diff --git a/search.php b/search.php
index 19bd499..627663b 100644
--- a/search.php
+++ b/search.php
@@ -46,11 +46,13 @@
       
     <?php endwhile ?>
     
-    <div class="pagenav">
-      <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
-      <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
-      <div class="clear"></div>
-    </div>
+    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+      <div class="pagenav">
+        <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
+        <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
+        <div class="clear"></div>
+      </div>
+    <?php } ?>
     
   <?php else : ?>