diff --git a/library/includes/functions.php b/library/includes/functions.php
index fec7ce425..03c7b3bcb 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1949,14 +1949,24 @@ function hash_search($hash)
     global $lang;
 
     $hash = htmlCHR(trim($hash));
+    $info_hash_where = null;
 
-    if (!isset($hash) || mb_strlen($hash, 'UTF-8') != 40) {
+    if (!isset($hash)) {
         bb_die(sprintf($lang['HASH_INVALID'], $hash));
     }
 
-    $info_hash = DB()->escape(pack("H*", $hash));
+    $info_hash = DB()->escape(pack('H*', $hash));
 
-    if ($row = DB()->fetch_row("SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash'")) {
+    // Check info_hash version
+    if (mb_strlen($hash, 'UTF-8') == 40) {
+        $info_hash_where = "WHERE info_hash = '$info_hash'";
+    } elseif (mb_strlen($hash, 'UTF-8') == 64) {
+        $info_hash_where = "WHERE info_hash_v2 = '$info_hash'";
+    } else {
+        bb_die(sprintf($lang['HASH_INVALID'], $hash));
+    }
+
+    if ($row = DB()->fetch_row("SELECT topic_id FROM " . BB_BT_TORRENTS . " $info_hash_where")) {
         redirect(TOPIC_URL . $row['topic_id']);
     } else {
         bb_die(sprintf($lang['HASH_NOT_FOUND'], $hash));
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index f6dc5164e..1bd3b1e24 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -283,7 +283,7 @@ $(function(){
 				</div>
 				</fieldset>
 				<fieldset>
-				<legend><span class="a-hash bold" onclick="$(this).addClass('bold').next().removeClass('bold'); $('#title_search').attr('name','{TITLE_MATCH_NAME}');">{L_TITLE_MATCH}</span>&nbsp;&middot;&nbsp;<span class="a-hash" onclick="$(this).addClass('bold').prev().removeClass('bold'); $('#title_search').attr('name','hash');">{L_HASH_S}</span></legend>
+				<legend><span class="a-hash bold" onclick="$(this).addClass('bold').next().removeClass('bold'); $('#title_search').attr('name','{TITLE_MATCH_NAME}').attr('maxlength','{TITLE_MATCH_MAX}');">{L_TITLE_MATCH}</span>&nbsp;&middot;&nbsp;<span class="a-hash" onclick="$(this).addClass('bold').prev().removeClass('bold'); $('#title_search').attr('name','hash').attr('maxlength',64);">{L_HASH_S}</span></legend>
 				<div>
 					<p class="input">
 						<input id="title_search" style="width: 95%;" class="post" type="text" size="50" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" />