diff --git a/net/samba/stable/Makefile b/net/samba/stable/Makefile
index fdc71ef2867..c995e69ce49 100644
--- a/net/samba/stable/Makefile
+++ b/net/samba/stable/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2002/04/25 23:34:11 dhartmei Exp $
+# $OpenBSD: Makefile,v 1.6 2002/05/07 10:03:33 dhartmei Exp $
 
 COMMENT=	"SMB and CIFS client and server for UNIX"
 
-DISTNAME=	samba-2.2.3a
+DISTNAME=	samba-2.2.4
 CATEGORIES=	net
 NEED_VERSION=	1.500
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
diff --git a/net/samba/stable/distinfo b/net/samba/stable/distinfo
index e6dd63a0683..81f3ccaa144 100644
--- a/net/samba/stable/distinfo
+++ b/net/samba/stable/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-2.2.3a.tar.gz) = b6ec2f076af69331535a82b586f55254
-RMD160 (samba-2.2.3a.tar.gz) = bb7af5e6e7e5283c7b77392df29888c8621ad428
-SHA1 (samba-2.2.3a.tar.gz) = cbcb16419fc83e1b17f97c971d8f41962ff49d5b
+MD5 (samba-2.2.4.tar.gz) = 09cf651daf544bf7aa79669d46b86e1e
+RMD160 (samba-2.2.4.tar.gz) = 1eade4bb21e8c48f7c945fabc8e127cfcb97c52c
+SHA1 (samba-2.2.4.tar.gz) = 0c2613e709f6f89e7986d7a7324263498e5b7d8c
diff --git a/net/samba/stable/patches/patch-configure_in b/net/samba/stable/patches/patch-configure_in
index 6a8ac586145..d94f7c2527a 100644
--- a/net/samba/stable/patches/patch-configure_in
+++ b/net/samba/stable/patches/patch-configure_in
@@ -1,7 +1,7 @@
---- configure.in.orig	Wed Feb  6 21:56:47 2002
-+++ configure.in	Fri Feb  8 11:44:50 2002
-@@ -810,7 +810,21 @@ case "$host_os" in
- 			LDSHFLAGS="-Wl,-h,\$@ -G"
+--- configure.in.orig	Tue May  7 11:06:52 2002
++++ configure.in	Tue May  7 11:10:11 2002
+@@ -868,7 +868,21 @@
+ 			SONAMEFLAG="-Wl,-h,"
  			PICFLAG="-KPIC"   # Is this correct for SunOS
  		;;
 -		*bsd*)  BLDSHARED="true"
@@ -9,17 +9,17 @@
 +			BLDSHARED="true"
 +			case "$host_os" in
 +			*openbsd[[01]].* | *openbsd2.[[0-7]] | *openbsd2.[[0-7]].*)
-+			  SHLD="ld"
-+			  LDSHFLAGS="-Bshareable"
-+			  ;;
++				SHLD="ld"
++				LDSHFLAGS="-Bshareable"
++				;;
 +			*)
-+			  LDSHFLAGS="-shared -fPIC"
-+			  ;;
++				LDSHFLAGS="-shared -fPIC"
++				;;
 +			esac
 +			PICFLAG="-fPIC"
 +			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 +		;;
 +		*freebsd* | *netbsd*)  BLDSHARED="true"
- 			LDSHFLAGS="-Wl,-soname,\$@ -shared"
+ 			LDSHFLAGS="-shared"
+ 			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
diff --git a/net/samba/stable/pkg/PLIST b/net/samba/stable/pkg/PLIST
index 75bec8d55b7..831fd56565c 100644
--- a/net/samba/stable/pkg/PLIST
+++ b/net/samba/stable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/02/05 09:07:13 dhartmei Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/05/07 10:03:33 dhartmei Exp $
 bin/convert_smbpasswd
 bin/make_printerdef
 bin/make_smbcodepage
@@ -149,9 +149,6 @@ share/doc/samba/textdocs/UNIX_SECURITY.txt
 share/doc/samba/textdocs/Win95.txt
 share/doc/samba/textdocs/WinNT.txt
 share/doc/samba/textdocs/cifsntdomain.txt
-share/doc/samba/textdocs/kurs.pdf
-share/doc/samba/textdocs/kurs.tex
-share/doc/samba/textdocs/logo.ps
 share/doc/samba/textdocs/security_level.txt
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export2_smbpasswd.pl
@@ -192,8 +189,9 @@ share/examples/samba/printer-accounting/hp5-redir
 share/examples/samba/printer-accounting/lp-acct
 share/examples/samba/printer-accounting/printcap
 share/examples/samba/printing/smbprint
-share/examples/samba/printing/smbprint-new.sh
 share/examples/samba/printing/smbprint.newer
+share/examples/samba/printing/smbprint.old
+share/examples/samba/printing/smbprint.safer
 share/examples/samba/printing/smbprint.sysv
 share/examples/samba/simple/README
 share/examples/samba/simple/smb.conf