diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
index cf87eebaa..719363ec5 100644
--- a/UPGRADE-2.0.md
+++ b/UPGRADE-2.0.md
@@ -19,3 +19,7 @@ UPGRADE FROM 1.x to 2.0
    `MongoDB\Driver\Cursor::getId()` and
    `MongoDB\Driver\CursorInterface::getId()` now return a `MongoDB\BSON\Int64`
    instance.
+
+* The `--with-libbson` and `--with-libmongoc` configure options have been
+  removed. Use `--with-mongodb-system-libs` instead.
+  
\ No newline at end of file
diff --git a/config.m4 b/config.m4
index 56f122c78..deeb21987 100644
--- a/config.m4
+++ b/config.m4
@@ -225,22 +225,6 @@ if test "$PHP_MONGODB" != "no"; then
                [no])
   PHP_MONGODB_VALIDATE_ARG([PHP_MONGODB_SYSTEM_LIBS], [yes no])
 
-  PHP_ARG_WITH([libbson],
-               [whether to use system libbson],
-               [AS_HELP_STRING([--with-libbson=@<:@yes/no@:>@],
-                               [MongoDB: Use system libbson (deprecated for --with-mongodb-system-libs) [default=no]])],
-               [no],
-               [no])
-  PHP_MONGODB_VALIDATE_ARG([PHP_LIBBSON], [yes no])
-
-  PHP_ARG_WITH([libmongoc],
-               [whether to use system libmongoc],
-               [AS_HELP_STRING([--with-libmongoc=@<:@yes/no@:>@],
-                               [MongoDB: Use system libmongoc (deprecated for --with-mongodb-system-libs) [default=no]])],
-               [no],
-               [no])
-  PHP_MONGODB_VALIDATE_ARG([PHP_LIBMONGOC], [yes no])
-
   PHP_ARG_WITH([mongodb-client-side-encryption],
                [whether to enable client-side encryption],
                [AS_HELP_STRING([--with-mongodb-client-side-encryption=@<:@auto/yes/no@:>@],
@@ -249,26 +233,6 @@ if test "$PHP_MONGODB" != "no"; then
                [no])
   PHP_MONGODB_VALIDATE_ARG([PHP_MONGODB_CLIENT_SIDE_ENCRYPTION], [auto yes no])
 
-  if test "$PHP_LIBBSON" != "no"; then
-    AC_MSG_WARN(Using --with-libbson is deprecated and will be removed in a future version. Please use --with-system-libs instead)
-
-    if test "$PHP_LIBMONGOC" = "no"; then
-      AC_MSG_ERROR(Cannot use system libbson and bundled libmongoc)
-    fi
-
-    PHP_MONGODB_SYSTEM_LIBS="yes"
-  fi
-
-  if test "$PHP_LIBMONGOC" != "no"; then
-    AC_MSG_WARN(Using --with-libmongoc is deprecated and will be removed in a future version. Please use --with-system-libs instead)
-
-    if test "$PHP_LIBBSON" = "no"; then
-      AC_MSG_ERROR(Cannot use system libmongoc and bundled libbson)
-    fi
-
-    PHP_MONGODB_SYSTEM_LIBS="yes"
-  fi
-
   PHP_MONGODB_BSON_VERSION_STRING="None"
   PHP_MONGODB_MONGOC_VERSION_STRING="None"
   PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"