diff --git a/net-fs/samba/patches/samba-3.6.23.patchset b/net-fs/samba/patches/samba-3.6.25.patchset
similarity index 93%
rename from net-fs/samba/patches/samba-3.6.23.patchset
rename to net-fs/samba/patches/samba-3.6.25.patchset
index c6ad48412..22f7d4b8a 100644
--- a/net-fs/samba/patches/samba-3.6.23.patchset
+++ b/net-fs/samba/patches/samba-3.6.25.patchset
@@ -1,7 +1,7 @@
 From 942e8a9a2ca249e9121181217178cb3a3ff6fc19 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 11 Apr 2014 15:46:09 +0400
-Subject: applying patch samba-3.6.23.patch
+Subject: settimeofday is not implemented on Haiku
 
 
 diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
diff --git a/net-fs/samba/samba-3.6.25.recipe b/net-fs/samba/samba-3.6.25.recipe
index 67997d857..8b74b2587 100644
--- a/net-fs/samba/samba-3.6.25.recipe
+++ b/net-fs/samba/samba-3.6.25.recipe
@@ -8,13 +8,13 @@ UNIX, Linux, IBM System 390, OpenVMS, and other operating systems. Samba uses \
 the TCP/IP protocol that is installed on the host server. When correctly \
 configured, it allows that host to interact with a Microsoft Windows client \
 or server as if it were a Windows file and print server."
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 COPYRIGHT="1992-2015 Anrew Tridgell and the Samba Team"
 LICENSE="GNU GPL v3"
 REVISION="5"
-SOURCE_URI="http://ftp.samba.org/pub/samba/samba-$portVersion.tar.gz"
+SOURCE_URI="https://download.samba.org/pub/samba/samba-$portVersion.tar.gz"
 CHECKSUM_SHA256="8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751"
-PATCHES="samba-3.6.23.patchset"
+PATCHES="samba-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -109,12 +109,15 @@ BUILD()
 {
 	cd source3
 	sed -i 's/| \*qnx\*/| \*qnx\* | haiku\*/g' configure
-	LDFLAGS="-lnetwork -lbnetapi" CFLAGS="-D_BSD_SOURCE" runConfigure ./configure \
-							--disable-swat --disable-pie \
-							--with-configdir=$settingsDir/samba \
-							--with-privatedir=$settingsDir/samba \
-							--with-localedir=$dataRootDir/locale \
-							--with-logfilebase=$sharedStateDir/log
+	export LDFLAGS="-lnetwork -lbnetapi"
+	export CFLAGS="-D_BSD_SOURCE"
+
+	runConfigure ./configure --disable-swat --disable-pie \
+		--with-configdir=$settingsDir/samba \
+		--with-privatedir=$settingsDir/samba \
+		--with-localedir=$dataRootDir/locale \
+		--with-logfilebase=$sharedStateDir/log
+
 	sed -i 's/-lpthread//g' Makefile
 	sed -i 's/-lc//g' Makefile
 	make $jobArgs
@@ -133,12 +136,13 @@ INSTALL()
 	# copy sample config file
 	cp ../testdata/samba3/smb.conf $settingsDir/samba
 
-	prepareInstalledDevelLibs libnetapi \
-						libsmbclient \
-						libsmbsharemodes \
-						libtalloc \
-						libtdb \
-						libtevent
+	prepareInstalledDevelLibs \
+		libnetapi \
+		libsmbclient \
+		libsmbsharemodes \
+		libtalloc \
+		libtdb \
+		libtevent
 
 	packageEntries devel $developDir
 }