diff --git a/TODO b/TODO
index 7da74006..a13c641a 100644
--- a/TODO
+++ b/TODO
@@ -311,14 +311,6 @@ Miscellaneous
   Complexity: C4
   Priority: Low
 
-- Internet Access Provider database.  Have oFono automatically configure
-  GPRS contexts based on an internal database.  Database format to be decided.
-  If there are multiple matches in the database, then some user intervention
-  might be required.
-
-  Priority: Medium
-  Complexity: C8
-
 - Add Location Service API for providing basic E911 support.
   This will be based on the 27.007 defined AT commands using
   XML for transport of positioning request and responses.
diff --git a/doc/features.txt b/doc/features.txt
index cb6df9c4..53bf28ea 100644
--- a/doc/features.txt
+++ b/doc/features.txt
@@ -531,6 +531,18 @@ GPRS
 	- IPv6
 	- Dual Stack (IPv4 + IPv6)
 
+- GPRS provisioning support.  oFono will automatically configure GPRS contexts
+  if no prior configuration (e.g. user or provisioning) has been detected.
+  If the GPRS atom detects that provisioning is required it will query the
+  inserted sim card for the Service Provider Name and call each registered
+  provisioning plugin with the MCC, MNC, SPN of the inserted SIM card.  If the
+  provisioning information is provided, then it is used to populate the
+  initial context configuration.
+
+- GPRS provisioning via 'Mobile Broadband Provider Info'.  oFono supports
+  provisioning of GPRS contexts via Mobile Broadband Provider Info project's
+  database.
+
 Location Reporting
 ==================