diff --git a/core/tar-itop.class.inc.php b/core/tar-itop.class.inc.php
index 98003b4994..41a356a26d 100644
--- a/core/tar-itop.class.inc.php
+++ b/core/tar-itop.class.inc.php
@@ -16,7 +16,7 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-require_once(APPROOT.'lib/archivetar/tar.php');
+require_once APPROOT.'lib/archive_tar/tar.php';
 
 /**
  * Class ITopArchiveTar
@@ -46,92 +46,4 @@ class ITopArchiveTar extends Archive_Tar
 	{
 		IssueLog::Warning($p_message);
 	}
-
-	/**
-	 * @param string $p_filename
-	 * @return bool
-	 */
-	public function _writeLongHeader($p_filename)
-	{
-		$v_uid = sprintf("%07s", 0);
-		$v_gid = sprintf("%07s", 0);
-		$v_perms = sprintf("%07s", 0);
-		$v_size = sprintf("%'011s", DecOct(strlen($p_filename)));
-		$v_mtime = sprintf("%011s", 0);
-		$v_typeflag = 'L';
-		$v_linkname = '';
-		$v_magic = 'ustar ';
-		$v_version = ' ';
-		$v_uname = '';
-		$v_gname = '';
-		$v_devmajor = '';
-		$v_devminor = '';
-		$v_prefix = '';
-		$v_binary_data_first = pack(
-			"a100a8a8a8a12a12",
-			'././@LongLink',
-			$v_perms,
-			$v_uid,
-			$v_gid,
-			$v_size,
-			$v_mtime
-		);
-		$v_binary_data_last = pack(
-			"a1a100a6a2a32a32a8a8a155a12",
-			$v_typeflag,
-			$v_linkname,
-			$v_magic,
-			$v_version,
-			$v_uname,
-			$v_gname,
-			$v_devmajor,
-			$v_devminor,
-			$v_prefix,
-			''
-		);
-
-		// ----- Calculate the checksum
-		$v_checksum = 0;
-		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++) {
-			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
-		}
-		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++) {
-			$v_checksum += ord(' ');
-		}
-		// ..... Last part of the header
-		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
-			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
-		}
-
-		// ----- Write the first 148 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_first, 148);
-
-		// ----- Write the calculated checksum
-		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
-		$v_binary_data = pack("a8", $v_checksum);
-		$this->_writeBlock($v_binary_data, 8);
-
-		// ----- Write the last 356 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_last, 356);
-
-		// ----- Write the filename as content of the block
-		$i = 0;
-		while (($v_buffer = substr($p_filename, (($i++) * 512), 512)) != '') {
-			$v_binary_data = pack("a512", "$v_buffer");
-			$this->_writeBlock($v_binary_data);
-		}
-
-		return true;
-	}
-
-	// This is overloaded too but private...
-	// private function _maliciousFilename($file)
-
-	public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename = null)
-	{
-		// This method is modified, but cannot overload it here as it calls the \ArchiveTar::_pathReduction private method
-		return parent::_addFile($p_filename, $p_header, $p_add_dir, $p_remove_dir, $v_stored_filename);
-	}
 }
\ No newline at end of file
diff --git a/lib/archivetar/PEAR.php b/lib/archive_tar/PEAR.php
similarity index 100%
rename from lib/archivetar/PEAR.php
rename to lib/archive_tar/PEAR.php
diff --git a/lib/archivetar/README.md b/lib/archive_tar/README.md
similarity index 100%
rename from lib/archivetar/README.md
rename to lib/archive_tar/README.md
diff --git a/lib/archivetar/tar.php b/lib/archive_tar/tar.php
similarity index 100%
rename from lib/archivetar/tar.php
rename to lib/archive_tar/tar.php