diff --git a/vpn-daemons/pptp/properties/nm-ppp-dialog.glade b/vpn-daemons/pptp/properties/nm-ppp-dialog.glade
index b74ba039e2..26b82a39b8 100644
--- a/vpn-daemons/pptp/properties/nm-ppp-dialog.glade
+++ b/vpn-daemons/pptp/properties/nm-ppp-dialog.glade
@@ -1091,7 +1091,7 @@
 	    <widget class="GtkExpander" id="pppd-expander">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="expanded">True</property>
+	      <property name="expanded">False</property>
 	      <property name="spacing">4</property>
 
 	      <child>
@@ -1706,6 +1706,61 @@
 			</packing>
 		      </child>
 
+		      <child>
+			<widget class="GtkHBox" id="hbox27">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label60">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Custom PPP options:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">1</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">pptp-remote</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkEntry" id="ppp-extra">
+			      <property name="visible">True</property>
+			      <property name="tooltip" translatable="yes">Host name or IP address of the PPTP server</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
 		      <child>
 			<widget class="GtkCheckButton" id="ppp-debug">
 			  <property name="visible">True</property>
diff --git a/vpn-daemons/pptp/properties/nm-ppp-properties.c b/vpn-daemons/pptp/properties/nm-ppp-properties.c
index f926ba19c8..e3a3175e39 100644
--- a/vpn-daemons/pptp/properties/nm-ppp-properties.c
+++ b/vpn-daemons/pptp/properties/nm-ppp-properties.c
@@ -60,7 +60,8 @@
                              "lcp-echo-interval=10;" \
                              "use-routes=no;" \
                              "routes=;" \
-                             "ppp-debug=no;"
+                             "ppp-debug=no;" \
+                             "ppp-extra='';"
 #define VPNUI_BTOOTH_DEFAULTS "bt-bdaddr=00:00:00:00:00:00;" \
                               "bt-channel=1;" 
 #define VPNUI_GPRS_DEFAULTS "gprs-packet-type=IP;" \
@@ -233,6 +234,11 @@ impl_setup (NetworkManagerVpnUIImpl *impl)
   "ppp-connect-delay", "PPP-Connect-Delay", _("Interval (in milliseconds) to wait before connecting."),
   NULL, NULL, impl );
 
+  opt = vpnui_opt_new(
+  "ppp-extra", VPN_UI_OPTTYPE_STRING, 
+  "ppp-extra", "PPP-Custom-Options", _("Custom PPP options"),
+  GTK_SIGNAL_FUNC(&editable_changed), NULL, impl );
+
   opt = vpnui_opt_new(
   "ppp-debug"  , VPN_UI_OPTTYPE_YESNO ,
   "ppp-debug", NULL, NULL,