diff --git a/ChangeLog b/ChangeLog
index a3460abd07..78a9625af1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-18  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting-ppp.c
+	  libnm-util/nm-setting-ppp.h
+		- Add 'no-vj-comp' option for TCP header compression
+		- baud, mru, mtu, lcp_echo_failure, and lcp_echo_interval are really
+			uint32
+
 2008-04-18  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-util/nm-setting-ppp.c
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index 843eee0f95..706540a5cd 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -14,6 +14,7 @@ enum {
 	PROP_REFUSE_MSCHAPV2,
 	PROP_NOBSDCOMP,
 	PROP_NODEFLATE,
+	PROP_NO_VJ_COMP,
 	PROP_REQUIRE_MPPE,
 	PROP_REQUIRE_MPPE_128,
 	PROP_MPPE_STATEFUL,
@@ -86,6 +87,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_NODEFLATE:
 		setting->nodeflate = g_value_get_boolean (value);
 		break;
+	case PROP_NO_VJ_COMP:
+		setting->no_vj_comp = g_value_get_boolean (value);
+		break;
 	case PROP_REQUIRE_MPPE:
 		setting->require_mppe = g_value_get_boolean (value);
 		break;
@@ -150,6 +154,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_NODEFLATE:
 		g_value_set_boolean (value, setting->nodeflate);
 		break;
+	case PROP_NO_VJ_COMP:
+		g_value_set_boolean (value, setting->no_vj_comp);
+		break;
 	case PROP_REQUIRE_MPPE:
 		g_value_set_boolean (value, setting->require_mppe);
 		break;
@@ -259,6 +266,14 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 						   FALSE,
 						   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
 
+	g_object_class_install_property
+		(object_class, PROP_NO_VJ_COMP,
+		 g_param_spec_boolean (NM_SETTING_PPP_NO_VJ_COMP,
+						   "No VJ compression",
+						   "No VJ compression",
+						   FALSE,
+						   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
+
 	g_object_class_install_property
 		(object_class, PROP_REQUIRE_MPPE,
 		 g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPE,
diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h
index c132b4eb01..3c5b1e8744 100644
--- a/libnm-util/nm-setting-ppp.h
+++ b/libnm-util/nm-setting-ppp.h
@@ -24,6 +24,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 #define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 #define NM_SETTING_PPP_NODEFLATE         "nodeflate"
+#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 #define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 #define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 #define NM_SETTING_PPP_MPPE_STATEFUL     "mpppe-stateful"
@@ -45,16 +46,17 @@ typedef struct {
 	gboolean refuse_mschapv2;
 	gboolean nobsdcomp;
 	gboolean nodeflate;
+	gboolean no_vj_comp;
 	gboolean require_mppe;
 	gboolean require_mppe_128;
 	gboolean mppe_stateful;
 	gboolean crtscts;
 
-	gint32 baud;
-	gint32 mru;
-	gint32 mtu;
-	gint32 lcp_echo_failure;
-	gint32 lcp_echo_interval;
+	guint32 baud;
+	guint32 mru;
+	guint32 mtu;
+	guint32 lcp_echo_failure;
+	guint32 lcp_echo_interval;
 } NMSettingPPP;
 
 typedef struct {