--- util-linux-2.27/login-utils/chfn.c.orig	2015-10-07 16:46:52.383201800 +0100
+++ util-linux-2.27/login-utils/chfn.c	2015-10-07 16:48:03.790821177 +0100
@@ -143,7 +143,7 @@
 		{ NULL, 0, NULL, 0 },
 	};
 
-	while ((c = getopt_long(argc, argv, "f:r:p:h:o:uv", long_options,
+	while ((c = getopt_long(argc, argv, "f:r:w:p:h:o:uv", long_options,
 				&index)) != -1) {
 		switch (c) {
 		case 'f':
@@ -152,12 +152,14 @@
 			ctl->newf.full_name = optarg;
 			status += check_gecos_string(_("Name"), optarg);
 			break;
+		case 'r':
 		case 'o':
 			if (!ctl->allow_room)
 				errx(EXIT_FAILURE, _("login.defs forbids setting %s"), _("Office"));
 			ctl->newf.office = optarg;
 			status += check_gecos_string(_("Office"), optarg);
 			break;
+		case 'w':
 		case 'p':
 			if (!ctl->allow_work)
 				errx(EXIT_FAILURE, _("login.defs forbids setting %s"), _("Office Phone"));