diff --git a/CHANGES b/CHANGES
index a0d9d83..919a9fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,10 @@ Corrections:
 	Tests: UNIX_SENDTO_UNLINK UNIX_CONNECT_UNLINK
 	Thanks to Nico Williams for reporting this major issue.
 
+	Length of single address options was limited to 511 bytes. This value
+	is now increased to 2047 bytes.
+	Change suggested by Mario Camou.
+
 Porting:
 	In gcc version 10 the default changed from -fcommon to -fno-common.
 	Consequently, linking filan and procan failed with error
diff --git a/xioopts.c b/xioopts.c
index 4cda110..efc00ab 100644
--- a/xioopts.c
+++ b/xioopts.c
@@ -1821,7 +1821,7 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
    unsigned long ulongval;
    long slongval;
    long long slonglongval;
-   char token[512], *tokp;  size_t len;
+   char token[2048], *tokp;  size_t len;
    int parsres;
    int result;
    char optbuf[256];  size_t optlen;