diff --git a/all-tests.opts b/all-tests.opts
index f0075ac..141cd92 100644
--- a/all-tests.opts
+++ b/all-tests.opts
@@ -5,3 +5,4 @@ osmo-sgsn --enable-external-tests --enable-vty-tests
 osmo-mgw --enable-external-tests --enable-vty-tests
 osmo-hlr --enable-external-tests
 osmo-pcu --enable-vty-tests
+osmo-upf --enable-external-tests
diff --git a/all.deps b/all.deps
index 54209eb..20972a8 100644
--- a/all.deps
+++ b/all.deps
@@ -24,6 +24,8 @@ asn1c	libasn1c
 osmo-gbproxy	libosmocore
 osmo-pcap	libosmocore
 osmo-bsc-nat	libosmo-sccp
+libgtpnl
+osmo-upf	libosmocore libgtpnl
 
 # can only clone these
 docker-playground
diff --git a/sanitize.opts b/sanitize.opts
index babb216..5f42da8 100644
--- a/sanitize.opts
+++ b/sanitize.opts
@@ -16,3 +16,4 @@ osmo-sip-connector --enable-sanitize
 osmo-bts --enable-sanitize
 osmo-smlc --enable-sanitize
 osmo-pcu --enable-sanitize
+osmo-upf --enable-sanitize
diff --git a/upf-manual.opts b/upf-manual.opts
new file mode 100644
index 0000000..701af3d
--- /dev/null
+++ b/upf-manual.opts
@@ -0,0 +1 @@
+osmo-upf --enable-manuals
diff --git a/werror.opts b/werror.opts
index 21c876a..7f2ee6c 100644
--- a/werror.opts
+++ b/werror.opts
@@ -13,3 +13,4 @@ osmo-msc --enable-werror
 osmo-sgsn --enable-werror
 osmo-bts --enable-werror
 osmo-bsc-nat --enable-werror
+osmo-upf --enable-werror