diff --git a/src/main-utils.c b/src/main-utils.c
index 0fa3644f3e..ea11ed767c 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -216,8 +216,8 @@ done:
 
 gboolean
 nm_main_utils_early_setup (const char *progname,
-                           char **argv[],
                            int *argc,
+                           char **argv[],
                            GOptionEntry *options,
                            GOptionEntry *more_options,
                            const char *summary)
diff --git a/src/main-utils.h b/src/main-utils.h
index 472fa5e70e..e33935562a 100644
--- a/src/main-utils.h
+++ b/src/main-utils.h
@@ -30,8 +30,8 @@ gboolean nm_main_utils_write_pidfile (const char *pidfile);
 gboolean nm_main_utils_check_pidfile (const char *pidfile, const char *name);
 
 gboolean nm_main_utils_early_setup (const char *progname,
-                                    char **argv[],
                                     int *argc,
+                                    char **argv[],
                                     GOptionEntry *options,
                                     GOptionEntry *more_options,
                                     const char *summary);
diff --git a/src/main.c b/src/main.c
index 7518e7011e..691f0b869c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -237,8 +237,8 @@ main (int argc, char *argv[])
 	main_loop = g_main_loop_new (NULL, FALSE);
 
 	if (!nm_main_utils_early_setup ("NetworkManager",
-	                                &argv,
 	                                &argc,
+	                                &argv,
 	                                options,
 	                                nm_config_get_options (),
 	                                _("NetworkManager monitors all network connections and automatically\nchooses the best connection to use.  It also allows the user to\nspecify wireless access points which wireless cards in the computer\nshould associate with.")))
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 9d5cdc05cf..e83bc49790 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -321,8 +321,8 @@ main (int argc, char *argv[])
 	setpgid (getpid (), getpid ());
 
 	if (!nm_main_utils_early_setup ("nm-iface-helper",
-	                                &argv,
 	                                &argc,
+	                                &argv,
 	                                options,
 	                                NULL,
 	                                _("nm-iface-helper is a small, standalone process that manages a single network interface.")))