diff --git a/inc/display.php b/inc/display.php
index b8fd9d0d..965356da 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -224,7 +224,7 @@
 		public function link($pre = '') {
 			global $config, $board;
 			
-			return $this->root . $board['dir'] . $config['dir']['res'] . $this->thread . '.html' . '#' . $pre . $this->id;
+			return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->thread) . '#' . $pre . $this->id;
 		}
 		public function postControls() {
 			global $board, $config;
@@ -409,7 +409,7 @@
 		public function link($pre = '') {
 			global $config, $board;
 			
-			return $this->root . $board['dir'] . $config['dir']['res'] . $this->id . '.html' . '#' . $pre . $this->id;
+			return $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->id) . '#' . $pre . $this->id;
 		}
 		public function add(Post $post) {
 			$this->posts[] = $post;
@@ -535,7 +535,7 @@
 			// Locked
 			($this->locked ? '<img class="icon" title="Locked" src="' . $config['image_locked'] . '" />' : '') .
 			// [Reply]
-			($index ? '<a href="' . $this->root . $board['dir'] . $config['dir']['res'] . $this->id . '.html">[Reply]</a>' : '') .
+			($index ? '<a href="' . $this->root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $this->id) . '">[Reply]</a>' : '') .
 			
 			// Mod controls
 			$this->postControls() .
diff --git a/post.php b/post.php
index 478f157b..6c64a975 100644
--- a/post.php
+++ b/post.php
@@ -522,7 +522,7 @@
 		$root = $post['mod'] ? $config['root'] . $config['file_mod'] . '?/' : $config['root'];
 		
 		if($config['always_noko'] || $noko) {
-			$redirect = $root . $board['dir'] . $config['dir']['res'] . ($OP?$id:$post['thread']) . '.html' . (!$OP?'#'.$id:'');
+			$redirect = $root . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $OP?$id:$post['thread']) . (!$OP?'#'.$id:'');
 		} else {
 			$redirect = $root . $board['dir'] . $config['file_index'];