diff --git a/samba.yaml b/samba.yaml
index 615e038995..e66e2dd2a8 100644
--- a/samba.yaml
+++ b/samba.yaml
@@ -1,6 +1,6 @@
 package:
   name: samba
-  version: 4.20.4
+  version: 4.21.0
   epoch: 0
   description: "Tools to access a server's filespace and printers via SMB"
   copyright:
@@ -30,6 +30,7 @@ environment:
       - libtirpc-dev
       - liburing-dev
       - linux-pam-dev
+      - lmdb-dev
       - ncurses-dev
       - ncurses-terminfo
       - ncurses-terminfo-base
@@ -60,7 +61,7 @@ environment:
 pipeline:
   - uses: fetch
     with:
-      expected-sha256: 3a92e97eaeb345b6b32232f503e14d34f03a7aa64c451fe8c258a11bbda908e5
+      expected-sha256: 09bb56db4ce003cafdbebe9bad368c4f4ff1945f732d18077d52f36ab20cef88
       uri: https://download.samba.org/pub/samba/stable/samba-${{package.version}}.tar.gz
 
   - uses: patch
@@ -223,9 +224,9 @@ subpackages:
     pipeline:
       - runs: |
           mkdir -p "${{targets.contextdir}}"/usr/lib/samba
-          mv "${{targets.destdir}}"/usr/lib/samba/libdcerpc-samba4-private-samba.so "${{targets.contextdir}}"/usr/lib
-          mv "${{targets.destdir}}"/usr/lib/samba/libidmap-private-samba.so "${{targets.contextdir}}"/usr/lib
-          mv "${{targets.destdir}}"/usr/lib/samba/libnss-info-private-samba.so "${{targets.contextdir}}"/usr/lib
+          mv "${{targets.destdir}}"/usr/lib/samba/libdcerpc-samba4-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
+          mv "${{targets.destdir}}"/usr/lib/samba/libidmap-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
+          mv "${{targets.destdir}}"/usr/lib/samba/libnss-info-private-samba.so "${{targets.contextdir}}"/usr/lib/samba
 
   - name: winbind
     description: Samba user and group resolver
diff --git a/samba/tinfo.patch b/samba/tinfo.patch
index b02b400957..37b246e41d 100644
--- a/samba/tinfo.patch
+++ b/samba/tinfo.patch
@@ -1,11 +1,11 @@
 diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
 --- a/source3/utils/wscript_build
 +++ b/source3/utils/wscript_build
-@@ -171,6 +171,7 @@
-                             regedit_hexedit.c regedit_list.c""",
+@@ -163,6 +163,7 @@
                    deps='''
                    ncurses
-+                  tinfo
                    menu
++                  tinfo
                    panel
-                   form
\ No newline at end of file
+                   form
+                   registry