diff --git a/CHANGELOG b/CHANGELOG
index a190f03..5c748ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.0.0] - 2021-12-09
+
+### Changed
+
+- Configure locale to en_US.UTF-8 in .profile file so that "git log" displays the accents correctly
+- Use vim as default git editor
+
 ## [6.9.2] - 2021-10-15
 
 ### Added
diff --git a/README.md b/README.md
index aadb890..ef12f7c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# EvoBSD 6.9.2
+# EvoBSD 7.0.0
 
 EvoBSD is an ansible project used for customising OpenBSD hosts
 used by Evolix.
diff --git a/roles/base/templates/profile.j2 b/roles/base/templates/profile.j2
index 1b031ed..0d74d8a 100644
--- a/roles/base/templates/profile.j2
+++ b/roles/base/templates/profile.j2
@@ -4,6 +4,8 @@
 
 PATH="{{ evobsd_path }}"
 export PATH HOME TERM
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
 export PS1="\u@\h:\w\\$ "
 HISTFILE=$HOME/.histfile
 export HISTSIZE=10000
diff --git a/roles/etc-git/tasks/main.yml b/roles/etc-git/tasks/main.yml
index 16d9979..04e4165 100644
--- a/roles/etc-git/tasks/main.yml
+++ b/roles/etc-git/tasks/main.yml
@@ -44,6 +44,12 @@
   tags:
     - etc-git
 
+- name: Set vim as default editor
+  git_config:
+    name: core.editor
+    scope: global
+    value: vim
+
 - name: does /etc/ have any commit?
   command: "git log"
   args: