diff --git a/configure b/configure
index 7db7726ddc6..19b5ecd9d0d 100755
--- a/configure
+++ b/configure
@@ -33,6 +33,7 @@ OPTIONS:
   --wipe, -w              Wipe whole repo (except startup.* files)
   --sanitize, -s          Enable sanitizer (mem)
   --platform, -p          Specify target platform
+  --option, -o            Enable specific VPP options (fib8, fib16)
 __EOF__
 }
 
@@ -104,6 +105,19 @@ while (( "$#" )); do
 	  ;;
       esac
       ;;
+    -o|--option)
+      shift 1
+      case "$1" in
+	fib8)
+	  shift 1
+	  args+=("-DVPP_IP_FIB_MTRIE_16=OFF")
+	  ;;
+	fib16)
+	  shift 1
+	  args+=("-DVPP_IP_FIB_MTRIE_16=ON")
+	  ;;
+      esac
+      ;;
     -*|--*=) # unsupported flags
       echo "Error: Unsupported flag $1" >&2
       exit 1