diff --git a/net-fs/samba/patches/samba-3.6.25.patchset b/net-fs/samba/patches/samba-3.6.25.patchset
index 22f7d4b8a..f1724c932 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 942e8a9a2ca249e9121181217178cb3a3ff6fc19 Mon Sep 17 00:00:00 2001
+From b1dc802741c34378966fced2b0aceb432b3d8627 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,5 +24,28 @@ index 0edb58c..2b8d365 100644
  static int net_time_set(struct net_context *c, int argc, const char **argv)
  {
 -- 
-1.8.3.4
+2.14.2
+
+
+From 28d3ff594888b1561fd354d0de8d645869d7f6dc 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.
+
+
+diff --git a/source3/include/includes.h b/source3/include/includes.h
+index 1beca26..7ef5d1f 100644
+--- a/source3/include/includes.h
++++ b/source3/include/includes.h
+@@ -196,7 +196,7 @@ typedef sig_atomic_t SIG_ATOMIC_T;
+ typedef sig_atomic_t volatile SIG_ATOMIC_T;
+ #endif
+ 
+-#ifndef uchar
++#if !defined(uchar)  && !defined(__HAIKU__)
+ #define uchar unsigned char
+ #endif
+ 
+-- 
+2.14.2