diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index fa910e8f1..be962097f 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-20  Houder  <houder@xs4all.nl>
+
+	* setfacl.cc (longopts): Drop accidentally requiring an argument to
+	the --mask and --no-mask options.
+
 2015-12-19  Houder  <houder@xs4all.nl>
 
 	* setfacl.cc (opts): Add colon to x option.
diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c
index a88fbcbb6..9d4b75dde 100644
--- a/winsup/utils/setfacl.c
+++ b/winsup/utils/setfacl.c
@@ -626,8 +626,8 @@ struct option longopts[] = {
   {"file", required_argument, NULL, 'f'},
   {"remove-default", no_argument, NULL, 'k'},
   {"modify", required_argument, NULL, 'm'},
-  {"no-mask", required_argument, NULL, 'n'},
-  {"mask", required_argument, NULL, '\n'},
+  {"no-mask", no_argument, NULL, 'n'},
+  {"mask", no_argument, NULL, '\n'},
   {"replace", no_argument, NULL, 'r'},
   {"substitute", required_argument, NULL, 's'},
   {"help", no_argument, NULL, 'h'},