diff --git a/filelist.php b/library/includes/file_list_v2.php
similarity index 97%
rename from filelist.php
rename to library/includes/file_list_v2.php
index 27634e1e1..2e5b10c7b 100644
--- a/filelist.php
+++ b/library/includes/file_list_v2.php
@@ -7,7 +7,9 @@
  * @license   https://github.com/torrentpier/torrentpier/blob/master/LICENSE MIT License
  */
 
-require __DIR__ . '/common.php';
+if (!defined('BB_ROOT')) {
+    die(basename(__FILE__));
+}
 
 // Start session management
 $user->session_start();
@@ -17,7 +19,7 @@ if ($bb_cfg['bt_disable_dht'] && IS_GUEST) {
     bb_simple_die($lang['BT_PRIVATE_TRACKER']);
 }
 
-$topic_id = !empty($_GET['topic']) ? (int)$_GET['topic'] : (http_response_code(404) && die($lang['INVALID_TOPIC_ID']));
+$topic_id = !empty($_GET['filelist']) ? (int)$_GET['filelist'] : (http_response_code(404) && die($lang['INVALID_TOPIC_ID']));
 
 $sql = 'SELECT t.attach_id, t.info_hash, t.info_hash_v2, t.size, ad.physical_filename
         FROM ' . BB_BT_TORRENTS . ' t
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index 136e11c4e..3bcd8c804 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -296,7 +296,7 @@ define('POSTING_URL', $bb_cfg['posting_url']);
 define('PROFILE_URL', 'profile.php?mode=viewprofile&u=');
 define('BONUS_URL', 'profile.php?mode=bonus');
 define('TOPIC_URL', 'viewtopic.php?t=');
-define('FILELIST_URL', 'filelist.php?topic=');
+define('FILELIST_URL', 'viewtopic.php?filelist=');
 
 define('USER_AGENT', strtolower($_SERVER['HTTP_USER_AGENT']));
 
diff --git a/viewtopic.php b/viewtopic.php
index b20701099..317192909 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -24,6 +24,7 @@ $page_cfg['load_tpl_vars'] = [
 ];
 
 $newest = $next_topic_id = 0;
+$file_list = isset($_GET['filelist']) ? include(INC_DIR . '/file_list_v2.php') : 0;
 $start = isset($_GET['start']) ? abs((int)$_GET['start']) : 0;
 $topic_id = isset($_GET[POST_TOPIC_URL]) ? (int)$_GET[POST_TOPIC_URL] : 0;
 $post_id = (!$topic_id && isset($_GET[POST_POST_URL])) ? (int)$_GET[POST_POST_URL] : 0;