diff --git a/AUTHORS b/AUTHORS
index eabd42a6bc1..5bf0b23bc4f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -233,6 +233,7 @@ The following people & communities have contributed to the development of Athena
 Thank you for all your hard work.
 
 3CeAM Dev Team
+RR-Emu Dev Team
 Athena Dev Team
 eAthena Dev Team
 Hercules Dev Team
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae5198e0a88..fb8969461f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,37 @@ If you are reading this in a text editor, simply ignore this section
 ### Removed
 -->
 
-## [v2021.01.11] `January 11 2020`
+
+## [v2021.02.08] `February 08 2021`
+
+### Added
+
+- Extended the quest database with new options. (#2874)
+  - Mob ID can be set to 0 to allow any monster ID.
+  - A monster level range can now be specified.
+  - A target monster's map can now be specified.
+  - A target monster's type (size, race and/or element) can now be specified.
+- Added new quest database entries using the new options. (part of #2874)
+- Added a failed assertion backtrace report in the removing player error in `unit->remove_map()`. (part of #2938)
+- Added support for constants and improved error messages in the quest DB. This affects the `Mob_ID`, `Drops/ItemId` and `Drops/MobId` fields. (#2886)
+- Added inheritance mechanism for the pet DB. Inheritance works in the same way as the mob and item databases, allowing to specify the `Inherit: true` flag in order to inherit (rather than overriding) an existing entry with the same Id. (#2206, issue #2181)
+- Updated the map database, NPC and Hateffect constants with new data. (#2936)
+
+### Changed
+
+- Changed the free cell search (as used by random mob spawns or teleport) to ignore the map margins, as in official servers. The margin size defaults to the official value of 15 and can be changed by editing the `search_freecell_map_margin` setting in `misc.conf`. (#2911)
+- Refactored and sanitized `map->search_freecell()`. The function has been renamed to `map->search_free_cell()` since the meaning of its return values has changed. (part of #2911)
+- Refactored and documented some pet database functions and added validation of the pet DB entries before they're inserted into the database. The new constant `ITEID_PET_FOOD` has been added. (part of #2206)
+
+### Fixed
+
+- Fixed a signed left shift overflow in socket.c. (part of #2938)
+- Fixed failing github workflows builds, switching from clang-10 to clang-11 since the former is no longer available in the Debian repositories. (part of #2938)
+- Forcefully disabled the compiler flag `-fcf-protection` to avoid issues in the `setjmp()` calls. (#2938)
+- Fixed some missing item IDs referenced by the quest DB in pre-re mode. (part of #2886)
+- Fixed grfio issues with large grf files. (#2937)
+
+## [v2021.01.11] `January 11 2021`
 
 ### Added
 
diff --git a/doc/constants.md b/doc/constants.md
index da603c7bd0c..0bead7af47f 100644
--- a/doc/constants.md
+++ b/doc/constants.md
@@ -4758,7 +4758,7 @@
 ### Server defines
 
 - `PACKETVER`: 20190530
-- `HERCULES_VERSION`: 202101110
+- `HERCULES_VERSION`: 202102080
 - `MAX_LEVEL`: 175
 - `MAX_STORAGE`: 600
 - `MAX_GUILD_STORAGE`: 600
diff --git a/src/config/core.h b/src/config/core.h
index 75c13e349c4..33a5ab86113 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -22,7 +22,7 @@
 #define CONFIG_CORE_H
 
 // from tag vXXXXXXXX.Y -> XXXXXXXXY
-#define HERCULES_VERSION 202101110
+#define HERCULES_VERSION 202102080
 
 /// Max number of items on @autolootid list
 #define AUTOLOOTITEM_SIZE 10