diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dca78b1..abbcc71c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## HEAD
+
+### Enhancements
+
+- The network column in the device list is now based on a value that gets updated in real time. The format of the column has changed slightly due to this change.
+
 ## 3.1.0 (2017-08-31)
 
 ### Enhancements
diff --git a/res/app/device-list/column/device-column-service.js b/res/app/device-list/column/device-column-service.js
index 9bc88b35..7348b330 100644
--- a/res/app/device-list/column/device-column-service.js
+++ b/res/app/device-list/column/device-column-service.js
@@ -128,7 +128,19 @@ module.exports = function DeviceColumnService($filter, gettext) {
   , network: TextCell({
       title: gettext('Network')
     , value: function(device) {
-        return device.phone ? device.phone.network : ''
+        if (!device.network) {
+          return ''
+        }
+
+        if (!device.network.connected) {
+          return ''
+        }
+
+        if (device.network.subtype) {
+          return (device.network.type + ' (' + device.network.subtype + ')').toUpperCase()
+        }
+
+        return (device.network.type || '').toUpperCase()
       }
     })
   , display: TextCell({