diff --git a/ChangeLog b/ChangeLog
index dfc8e10fb9..ec67637a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-25  Dan Williams  <dcbw@redhat.com>
+
+	* libnm-util/nm-setting-gsm.c
+	  libnm-util/nm-setting-gsm.h
+		- Fix up NM_GSM_NETWORK_* constants to accurately reflect the network
+			technology terms (bgo #551361)
+
 2008-09-25  Dan Williams  <dcbw@redhat.com>
 
 	Fix bgo #549401 (inspired by patch from Alexander Sack)
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index b65fa65a22..68c836b206 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -338,7 +338,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 					    "Network type",
 					    "Network type",
 					    NM_GSM_NETWORK_ANY,
-					    NM_GSM_NETWORK_PREFER_GSM,
+					    NM_GSM_NETWORK_PREFER_UMTS_HSPA,
 					    NM_GSM_NETWORK_ANY,
 					    G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 4305aaa788..58a1a63d4e 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/libnm-util/nm-setting-gsm.h
@@ -65,10 +65,10 @@ GQuark nm_setting_gsm_error_quark (void);
 
 enum {
 	NM_GSM_NETWORK_ANY = -1,
-	NM_GSM_NETWORK_GPRS = 0,
-	NM_GSM_NETWORK_GSM = 1,
-	NM_GSM_NETWORK_PREFER_GPRS = 2,
-	NM_GSM_NETWORK_PREFER_GSM = 3
+	NM_GSM_NETWORK_UMTS_HSPA = 0,
+	NM_GSM_NETWORK_GPRS_EDGE = 1,
+	NM_GSM_NETWORK_PREFER_UMTS_HSPA = 2,
+	NM_GSM_NETWORK_PREFER_GPRS_EDGE = 3
 };
 
 typedef struct {