@@ -55,7 +55,7 @@ index 96b25140c..1ad704d4a 100644
5555 typedef struct _TzDB TzDB;
5656 typedef struct _TzLocation TzLocation;
5757diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
58−index 4541986db..da7826bfe 100644
58+index 7fce8691e..b839f8b69 100644
5959--- a/panels/info/cc-info-overview-panel.c
6060+++ b/panels/info/cc-info-overview-panel.c
6161@@ -187,7 +187,7 @@ load_gnome_version (char **version,
@@ -84,10 +84,10 @@ index 9390a3308..d30b4a68e 100644
8484 }
8585
8686diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
87−index 360fbfc72..870157a11 100644
87+index dd99a7485..4baa88a4e 100644
8888--- a/panels/network/net-device-wifi.c
8989+++ b/panels/network/net-device-wifi.c
90−@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object)
90+@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
9191 return;
9292 }
9393 uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
@@ -123,10 +123,10 @@ index f53ba217e..d24bcaeb9 100644
123123
124124 /* Use SNMP to get printer's informations */
125125diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
126−index 35859526d..21486c917 100644
126+index e0604b8c3..fc323c1b2 100644
127127--- a/panels/region/cc-region-panel.c
128128+++ b/panels/region/cc-region-panel.c
129−@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
129+@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
130130 layout_variant = cc_input_source_get_layout_variant (source);
131131
132132 if (layout_variant && layout_variant[0])
@@ -140,7 +140,7 @@ index 35859526d..21486c917 100644
140140
141141 g_spawn_command_line_async (commandline, NULL);
142142diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
143−index 00239ce0f..617c98870 100644
143+index 19934f186..9f41a9620 100644
144144--- a/panels/user-accounts/run-passwd.c
145145+++ b/panels/user-accounts/run-passwd.c
146146@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -152,6 +152,19 @@ index 00239ce0f..617c98870 100644
152152 argv[1] = NULL;
153153
154154 envp = g_get_environ ();
155+diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
156+index 83d4cd091..e8784c722 100644
157+--- a/panels/user-accounts/user-utils.c
158++++ b/panels/user-accounts/user-utils.c
159+@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
160+ * future, so it would be nice to have some official way for this
161+ * instead of relying on the current "--login" implementation.
162+ */
163+- argv[0] = "/usr/sbin/usermod";
164++ argv[0] = "@usermod@";
165+ argv[1] = "--login";
166+ argv[2] = data->username;
167+ argv[3] = "--";
155168diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
156169index 9cb92007a..84d2f0fa3 100644
157170--- a/tests/datetime/test-endianess.c