diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc31fd7..cf5578d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ CHANGELOG
 In Development
 --------------
 
+Control panel:
+
+* Prevent click-jacking of the management interface by adding HTTP headers.
+
 Setup:
 
 * Setup dialogs did not appear correctly when connecting to SSH using Putty on Windows.
diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf
index 2fb9972..8fd546a 100644
--- a/conf/nginx-primaryonly.conf
+++ b/conf/nginx-primaryonly.conf
@@ -6,6 +6,9 @@
 	location /admin/ {
 		proxy_pass http://127.0.0.1:10222/;
 		proxy_set_header X-Forwarded-For $remote_addr;
+		add_header X-Frame-Options "DENY";
+		add_header X-Content-Type-Options nosniff;
+		add_header Content-Security-Policy "frame-ancestors 'none';";
 	}
 
 	# ownCloud configuration.