diff --git a/src/common.h b/src/common.h
index 32e6f8bd..885169fb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -836,6 +836,7 @@ void xheader_store (char const *keyword, struct tar_stat_info *st,
 void xheader_read (struct xheader *xhdr, union block *header, off_t size);
 void xheader_write (char type, char *name, time_t t, struct xheader *xhdr);
 void xheader_write_global (struct xheader *xhdr);
+void xheader_forbid_global (void);
 void xheader_finish (struct xheader *hdr);
 void xheader_destroy (struct xheader *hdr);
 char *xheader_xhdr_name (struct tar_stat_info *st);
diff --git a/src/update.c b/src/update.c
index 2f823e45..4aa4ac6a 100644
--- a/src/update.c
+++ b/src/update.c
@@ -111,7 +111,7 @@ update_archive (void)
 
   name_gather ();
   open_archive (ACCESS_UPDATE);
-  buffer_write_global_xheader ();
+  xheader_forbid_global ();
 
   while (!found_end)
     {
diff --git a/src/xheader.c b/src/xheader.c
index e9385022..010cab79 100644
--- a/src/xheader.c
+++ b/src/xheader.c
@@ -469,6 +469,14 @@ xheader_write_global (struct xheader *xhdr)
     }
 }
 
+/* Forbid modifications of the global extended header */
+void
+xheader_forbid_global (void)
+{
+  if (keyword_global_override_list)
+    USAGE_ERROR ((0, 0, _("can't update global extended header record")));
+}
+
 void
 xheader_xattr_init (struct tar_stat_info *st)
 {