diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index 8576153a74..6c261fa53c 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-07  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Christian Persch <chpe@gnome.org>
+
+	* auth-dialog/main.c
+		- Fix memleak by unrefing the GnomeProgram instance (Gnome.org #383123)
+
 2006-12-04  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-vpnc-service.c
diff --git a/vpn-daemons/vpnc/auth-dialog/main.c b/vpn-daemons/vpnc/auth-dialog/main.c
index 935cf78e86..aa5a0425f1 100644
--- a/vpn-daemons/vpnc/auth-dialog/main.c
+++ b/vpn-daemons/vpnc/auth-dialog/main.c
@@ -229,7 +229,8 @@ main (int argc, char *argv[])
 	static gchar *vpn_service = NULL;
 	GError *error = NULL;
 	GOptionContext *context;
-	static GOptionEntry entries[] = 
+	GnomeProgram *program;
+	GOptionEntry entries[] =
 		{
 			{ "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL},
 			{ "name", 'n', 0, G_OPTION_ARG_STRING, &vpn_name, "Name of VPN connection", NULL},
@@ -246,8 +247,13 @@ main (int argc, char *argv[])
 	
 	context = g_option_context_new ("- vpnc auth dialog");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-	g_option_context_parse (context, &argc, &argv, &error);
+	
+	program = gnome_program_init ("nm-vpnc-auth-dialog", VERSION,
+				      LIBGNOMEUI_MODULE,
+				      argc, argv,
+				      GNOME_PARAM_GOPTION_CONTEXT, context,
+				      GNOME_PARAM_NONE);
+	  
 
 	if (vpn_name == NULL || vpn_service == NULL) {
 		fprintf (stderr, "Have to supply both name and service\n");
@@ -259,10 +265,6 @@ main (int argc, char *argv[])
 		goto out;		
 	}
 
-	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
-			    argc, argv, 
-			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
-	  
 	passwords = get_passwords (vpn_name, vpn_service, retry);
 	if (passwords == NULL)
 		goto out;
@@ -283,7 +285,7 @@ main (int argc, char *argv[])
 	fread (buf, sizeof (char), sizeof (buf), stdin);
 
 out:
-	g_option_context_free (context);
+	g_object_unref (program);
 
 	return passwords != NULL ? 0 : 1;
 }