diff --git a/phpBB/search.php b/phpBB/search.php
index 7dc9621ede..25f714a585 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -392,6 +392,7 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
 					$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
 					$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id']);
 					$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
+					$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=".$searchset[$i]['post_id']."#".$searchset[$i]['post_id']);
 
 					$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['default_timezone']);
 
diff --git a/phpBB/templates/PSO/search_results_body.tpl b/phpBB/templates/PSO/search_results_body.tpl
index 8b73c00360..fd2609d758 100644
--- a/phpBB/templates/PSO/search_results_body.tpl
+++ b/phpBB/templates/PSO/search_results_body.tpl
@@ -42,7 +42,7 @@
 			<tr>
 				<td><table width="100%" height="100%" cellspacing="0" cellpadding="4" border="0">
 					<tr>
-						<td bgcolor="{T_TD_COLOR2}"><img src="images/posticon.gif" alt="Post image icon"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_POSTED}: {searchresults.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {searchresults.POST_SUBJECT}</font><hr></td>
+						<td bgcolor="{T_TD_COLOR2}"><a href="{searchresults.U_POST}"><img src="images/posticon.gif" alt="Post image icon" border="0"></a><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_POSTED}: {searchresults.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {searchresults.POST_SUBJECT}</font><hr></td>
 					</tr>
 					<tr>
 						<td height="100%" bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{searchresults.MESSAGE}</font><br><br></td>