diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index 530f610ac2..d9bbe3d384 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-pptp-pppd-plugin.c
+		- (nm_ip_up): use correct option index (bgo #517468)
+
 2008-07-27  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Michael Biebl <biebl@debian.org>
diff --git a/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c b/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c
index bfaae5ac16..29cc70b851 100644
--- a/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c
+++ b/vpn-daemons/pptp/src/nm-pptp-pppd-plugin.c
@@ -154,8 +154,8 @@ value_destroy (gpointer data)
 static void
 nm_ip_up (void *data, int arg)
 {
-	ipcp_options opts = ipcp_gotoptions[ifunit];
-	ipcp_options peer_opts = ipcp_hisoptions[ifunit];
+	ipcp_options opts = ipcp_gotoptions[0];
+	ipcp_options peer_opts = ipcp_hisoptions[0];
 	GHashTable *hash;
 	GArray *array;
 	GValue *val;