diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43e598566..de4a6fc24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,77 @@
+0.38.0
+------
+
+    Bug #1699: Guard will continuously run into mudcrab
+    Bug #1934: Saw in Dome of Kasia doesnt harm the player
+    Bug #1962: Rat floats when killed near the door
+    Bug #1963: Kwama eggsacks pulse too fast
+    Bug #2198: NPC voice sound source should be placed at their head
+    Bug #2210: OpenMW installation wizard crashes...
+    Bug #2211: Editor: handle DELE subrecord at the end of a record
+    Bug #2413: ESM error Unknown subrecord in Grandmaster of Hlaalu
+    Bug #2537: Bloodmoon quest Ristaag: Sattir not consistently dying, plot fails to advance; same with Grerid
+    Bug #2697: "The Swimmer" moves away after leading you to underwater cave
+    Bug #2724: Loading previous save duplicates containers and harvestables
+    Bug #2769: Inventory doll - Cursor not respecting order of clothes
+    Bug #2865: Scripts silently fail when moving NPCs between cells.
+    Bug #2873: Starting a new game leads to CTD / Fatal Error
+    Bug #2918: Editor: it's not possible to create an omwaddon containing a dot in the file name
+    Bug #2933: Dialog box can't disable a npc if it is in another cell. (Rescue Madura Seran).
+    Bug #2942: atronach sign behavior (spell absorption) changes when trying to receive a blessing at "shrine of tribunal"
+    Bug #2952: Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
+    Bug #2961: ESM Error: Unknown subrecord if Deus Ex Machina mod is loaded
+    Bug #2972: Resurrecting the player via console does not work when health was 0
+    Bug #2986: Projectile weapons work underwater
+    Bug #2988: "Expected subrecord" bugs showing up.
+    Bug #2991: Can't use keywords in strings for MessageBox
+    Bug #2993: Tribunal:The Shrine of the Dead – Urvel Dulni can't stop to follow the player.
+    Bug #3008: NIFFile Error while loading meshes with a NiLODNode
+    Bug #3010: Engine: items should sink to the ground when dropped under water
+    Bug #3011: NIFFile Error while loading meshes with a NiPointLight
+    Bug #3016: Engine: something wrong with scripting - crash / fatal error
+    Bug #3020: Editor: verify does not check if given "item ID" (as content) for a "container" exists
+    Bug #3026: [MOD: Julan Ashlander Companion] Dialogue not triggering correctly
+    Bug #3028: Tooltips for Health, Magicka and Fatigue show in Options menu even when bars aren't visible
+    Bug #3034: Item count check dialogue option doesn't work (Guards accept gold even if you don't have enough)
+    Bug #3036: Owned tooltip color affects spell tooltips incorrrectly
+    Bug #3037: Fatal error loading old ES_Landscape.esp in Store<ESM::LandTexture>::search
+    Bug #3038: Player sounds come from underneath
+    Bug #3040: Execution of script failed: There is a message box already
+    Bug #3047: [MOD: Julan Ashlander Companion] Scripts KS_Bedscript or KS_JulanNight not working as intended
+    Bug #3048: Fatal Error
+    Bug #3051: High field of view results in first person rendering glitches
+    Bug #3053: Crash on new game at character class selection
+    Bug #3058: Physiched sleeves aren't rendered correctly.
+    Bug #3060: NPCs use wrong landing sound
+    Bug #3062: Mod support regression: Andromeda's fast travel.
+    Bug #3063: Missing Journal Textures without Tribunal and Bloodmoon installed
+    Bug #3077: repeated aifollow causes the distance to stack
+    Bug #3078: Creature Dialogues not showing when certain Function/Conditions are required.
+    Bug #3082: Crash when entering Holamayan Monastery with mesh replacer installed
+    Bug #3086: Party at Boro's House – Creature with Class don't talk under OpenMW
+    Bug #3089: Dreamers spawn too soon
+    Bug #3100: Certain controls erroneously work as a werewolf
+    Bug #3102: Multiple unique soultrap spell sources clone souls.
+    Bug #3105: Summoned creatures and objects disappear at midnight
+    Bug #3112: gamecontrollerdb file creation with wrong extension
+    Bug #3116: Dialogue Function "Same Race" is avoided
+    Bug #3117: Dialogue Bug: Choice conditions are tested when not in a choice
+    Bug #3118: Body Parts are not rendered when used in a pose.
+    Bug #3122: NPC direction is reversed during sneak awareness check
+    Feature #776: Sound effects from one direction don't necessarily affect both speakers in stereo
+    Feature #858: Different fov settings for hands and the game world
+    Feature #1176: Handle movement of objects between cells
+    Feature #2507: Editor: choosing colors for syntax highlighting
+    Feature #2867: Editor: hide script error list when there are no errors
+    Feature #2885: Accept a file format other than nif
+    Feature #2982: player->SetDelete 1 results in: PC can't move, menu can be opened
+    Feature #2996: Editor: make it possible to preset the height of the script check area in a script view
+    Feature #3014: Editor: Tooltips in 3D scene
+    Feature #3064: Werewolf field of view
+    Feature #3074: Quicksave indicator
+    Task #287: const version of Ptr
+    Task #2542: Editor: redo user settings system
+
 0.37.0
 ------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9c74df9..52970cfb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 37)
+set(OPENMW_VERSION_MINOR 38)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")