diff --git a/all.deps b/all.deps
index 39d1507..7e099cf 100644
--- a/all.deps
+++ b/all.deps
@@ -24,10 +24,14 @@ asn1c	libasn1c
 osmo-gbproxy	libosmocore
 osmo-pcap	libosmocore
 osmo-bsc-nat	libosmo-sccp osmo-mgw
+libosmo-pfcp	libosmocore
 libgtpnl
-osmo-upf	libosmocore libgtpnl
+libnftnl
+nftables	libnftnl
+osmo-upf	libosmocore libosmo-pfcp libgtpnl nftables
 osmo-cbc	libosmo-netif
 osmo-hnodeb	osmo-iuh
+osmo-hnbgw	osmo-iuh osmo-mgw libosmo-pfcp
 
 # can only clone these
 docker-playground
diff --git a/gen_makefile.py b/gen_makefile.py
index d83072f..573fd6b 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -171,6 +171,9 @@ def gen_makefile_clone(proj, src, src_proj, url, push_url):
 	touch $@
   '''
 
+  if proj in ("libgtpnl", "libnftnl"):
+    url = "git://git.netfilter.org"
+
   return f'''
 .make.{proj}.clone:
 	@echo -e "\\n\\n\\n===== $@\\n"
diff --git a/sanitize.opts b/sanitize.opts
index 34f27af..51721bc 100644
--- a/sanitize.opts
+++ b/sanitize.opts
@@ -3,6 +3,7 @@ libosmo-abis --enable-sanitize
 libosmocore --enable-sanitize
 libosmo-netif --enable-sanitize
 libosmo-sccp --enable-sanitize
+libosmo-pfcp --enable-sanitize
 libsmpp34 --enable-sanitize
 osmo-bsc --enable-sanitize
 osmo-ggsn --enable-sanitize
@@ -19,3 +20,4 @@ osmo-smlc --enable-sanitize
 osmo-pcu --enable-sanitize
 osmo-upf --enable-sanitize
 osmo-cbc --enable-sanitize
+osmo-hnbgw --enable-sanitize
diff --git a/werror.opts b/werror.opts
index 8758fbd..af7c8dd 100644
--- a/werror.opts
+++ b/werror.opts
@@ -3,6 +3,7 @@ libosmo-abis --enable-werror
 libosmocore --enable-werror
 libosmo-netif --enable-werror
 libosmo-sccp --enable-werror
+libosmo-pfcp --enable-werror
 libsmpp34 --enable-werror
 osmo-bsc --enable-werror
 osmo-ggsn --enable-werror
@@ -16,3 +17,4 @@ osmo-bsc-nat --enable-werror
 osmo-upf --enable-werror
 osmo-cbc --enable-werror
 osmo-hnodeb --enable-werror
+osmo-hnbgw --enable-werror