diff --git a/network/samba/samba.conf b/network/samba/samba.conf
index 1b5b004ca..11052c5e6 100644
--- a/network/samba/samba.conf
+++ b/network/samba/samba.conf
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../samba/samba.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 # 
@@ -29,9 +29,13 @@ var_append extraconfopt " " "--with-smbmount --with-automount \
 #FIXME hack to honor lib64 :-(
 var_append confopt ' ' "--with-libdir=$root/$prefix/${libdir##*/}"
 
-case $arch in
-	x86|sparc|powerpc) var_append extraconfopt ' ' '--with-spinlocks' ;;
-esac
+#FIXME: temporarily disable spinlocks because it fails to build (3.0.23+)
+#case $arch in
+#	x86|sparc|powerpc) var_append extraconfopt ' ' '--with-spinlocks' ;;
+#	*)
+		var_append extraconfopt ' ' '--without-spinlocks'
+#		;;
+#esac
 
 # pam support
 pkginstalled pam && var_append extraconfopt ' ' "--with-pam --with-pam_smbpass"
diff --git a/network/samba/samba.desc b/network/samba/samba.desc
index 15f84f2ec..1ae571b86 100644
--- a/network/samba/samba.desc
+++ b/network/samba/samba.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] 
 [COPY] Filename: package/.../samba/samba.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY] 
@@ -31,13 +31,13 @@
 [U] http://www.samba.org/
 
 [A] Support <samba@samba.org> {Mail List}
-[M] The OpenSDE Community <list@opensde.org>
+[M] Alejandro Mery <amery@opensde.org>
 
 [C] extra/server
 
 [L] GPL
 [S] Stable
-[V] 3.0.23d
+[V] 3.0.24
 [P] X -----5---9 128.500
 
-[D] 174925286 samba-3.0.23d.tar.gz http://samba.org/samba/ftp/
+[D] 2082347602 samba-3.0.24.tar.gz http://samba.org/samba/ftp/