diff --git a/net-fs/samba/patches/samba-3.6.25.patchset b/net-fs/samba/patches/samba-3.6.25.patchset
index f1724c932..c81fe01a8 100644
--- a/net-fs/samba/patches/samba-3.6.25.patchset
+++ b/net-fs/samba/patches/samba-3.6.25.patchset
@@ -1,4 +1,4 @@
-From b1dc802741c34378966fced2b0aceb432b3d8627 Mon Sep 17 00:00:00 2001
+From 9ee6999667c72855787006a5ed06599850706ca4 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 11 Apr 2014 15:46:09 +0400
 Subject: settimeofday is not implemented on Haiku
@@ -24,10 +24,10 @@ index 0edb58c..2b8d365 100644
  static int net_time_set(struct net_context *c, int argc, const char **argv)
  {
 -- 
-2.14.2
+2.28.0
 
 
-From 28d3ff594888b1561fd354d0de8d645869d7f6dc Mon Sep 17 00:00:00 2001
+From bd80153bb94edcc829723bd09a687c723742cbf0 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 11 Oct 2017 20:20:42 +0200
 Subject: Haiku has only a typedef for uchar.
@@ -47,5 +47,53 @@ index 1beca26..7ef5d1f 100644
  #endif
  
 -- 
-2.14.2
+2.28.0
+
+
+From a0bae36ef6953ae4126bdf7ad99c9b57ab2495bf Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 22 Nov 2020 15:39:52 +0000
+Subject: Fix conflicting int types for 32bit Haiku
+
+
+diff --git a/lib/replace/replace.h b/lib/replace/replace.h
+index 926ccc7..5bd6582 100644
+--- a/lib/replace/replace.h
++++ b/lib/replace/replace.h
+@@ -65,6 +65,9 @@
+ #endif
+ 
+ /* Decimal notation.  */
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#else
+ #ifndef PRId8
+ # define PRId8		"d"
+ #endif
+@@ -103,6 +106,7 @@
+ #ifndef PRIu64
+ # define PRIu64		__PRI64_PREFIX "u"
+ #endif
++#endif
+ 
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+diff --git a/source3/include/includes.h b/source3/include/includes.h
+index 7ef5d1f..bb84fca 100644
+--- a/source3/include/includes.h
++++ b/source3/include/includes.h
+@@ -209,6 +209,11 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
+    as signed and unsigned int will work.
+ */
+ 
++#if defined(__HAIKU__)
++#include <SupportDefs.h>
++#include <ByteOrder.h>
++#endif
++
+ #ifndef uint8
+ #define uint8 uint8_t
+ #endif
+-- 
+2.28.0
 
diff --git a/net-fs/samba/samba-3.6.25.recipe b/net-fs/samba/samba-3.6.25.recipe
index e7e6be9d4..8b262edfa 100644
--- a/net-fs/samba/samba-3.6.25.recipe
+++ b/net-fs/samba/samba-3.6.25.recipe
@@ -11,7 +11,7 @@ or server as if it were a Windows file and print server."
 HOMEPAGE="https://www.samba.org/"
 COPYRIGHT="1992-2015 Anrew Tridgell and the Samba Team"
 LICENSE="GNU GPL v3"
-REVISION="8"
+REVISION="9"
 SOURCE_URI="https://download.samba.org/pub/samba/samba-$portVersion.tar.gz"
 CHECKSUM_SHA256="8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751"
 PATCHES="samba-$portVersion.patchset"
@@ -89,7 +89,7 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
-	devel:libreadline$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 8
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="