diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dfb6239..43019df5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ The **patch** part changes incrementally at each release.
 ## [Unreleased]
 
 ### Added
-
+* evocheck : add "x-frame-options: sameorigin" for Munin
 * etc-git: ignore evobackup/.keep-* files
 
 ### Changed
diff --git a/nginx/templates/evolinux-default.conf.j2 b/nginx/templates/evolinux-default.conf.j2
index eeffa686..5662ba51 100644
--- a/nginx/templates/evolinux-default.conf.j2
+++ b/nginx/templates/evolinux-default.conf.j2
@@ -35,6 +35,7 @@ server {
 
     location /munin/ {
         alias   /var/cache/munin/www/;
+        add_header X-Frame-Options "SAMEORIGIN";
     }
 
     location ^~ /munin-cgi/munin-cgi-graph/ {