2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5f2e7387..9ad83068 100644
--- a/NEWS
+++ b/NEWS
@@ -107,3 +107,6 @@ Changes since 3.1.0:
   DEVELOPER RELATED:
 
     - We now include an example systemd file (in packaging/systemd).
+
+    - Tweaked configure to make sure that any intended use of the included popt
+      and/or zlib code is put early in the CFLAGS.
diff --git a/options.c b/options.c
index 5b061ade..62dfe4f0 100644
--- a/options.c
+++ b/options.c
@@ -2500,7 +2500,7 @@ void server_options(char **args, int *argc_p)
 		argstr[x++] = 's'; /* symlink iconv translation support */
 #endif
 		argstr[x++] = 'f'; /* flist I/O-error safety support */
-		argstr[x++] = 'x'; /* xattr hardlink optimization not supported */
+		argstr[x++] = 'x'; /* xattr hardlink optimization not desired */
 	}
 
 	if (x >= (int)sizeof argstr) { /* Not possible... */