diff --git a/CHANGELOG b/CHANGELOG
index a70c975..86ac264 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * base: use a variable for /etc/installurl content
 * base: use "servers" option instead of "server" option for ntpd.conf
 * base: fstab options can be activated or not
+* base: configure "/usr/X11R6" and "/usr/local" for servers that have a mount on it
 
 ### Fixed
 
diff --git a/roles/base/tasks/fstab_entries.yml b/roles/base/tasks/fstab_entries.yml
index e812051..efddec7 100644
--- a/roles/base/tasks/fstab_entries.yml
+++ b/roles/base/tasks/fstab_entries.yml
@@ -15,6 +15,8 @@
     - "/"
     - "/var"
     - "/usr"
+    - "/usr/X11R6"
+    - "/usr/local"
     - "/tmp"
     - "/home"
   tags: