diff --git a/package/base/samba/head.patch b/package/base/samba/head.patch
new file mode 100644
index 000000000..3fe28050b
--- /dev/null
+++ b/package/base/samba/head.patch
@@ -0,0 +1,43 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/sirkull/samba/head.patch
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+diff -dur samba-3.0.20-orig/source/configure samba-3.0.20/source/configure
+--- source/configure	2005-08-19 21:09:01.000000000 +0200
++++ source/configure	2005-09-29 10:30:23.000000000 +0200
+@@ -4041,7 +4041,7 @@
+ 
+ 
+ if test "$ac_cv_prog_gnu_ld" = "yes"; then
+-	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
++	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -n1`
+ 	echo "$as_me:$LINENO: checking GNU ld release date" >&5
+ echo $ECHO_N "checking GNU ld release date... $ECHO_C" >&6
+ 		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+diff -dur samba-3.0.20-orig/source/configure.in samba-3.0.20/source/configure.in
+--- source/configure.in	2005-08-19 19:16:29.000000000 +0200
++++ source/configure.in	2005-09-29 10:30:09.000000000 +0200
+@@ -350,7 +350,7 @@
+ dnl --allow-shlib-undefined flag defined.  This causes a stackload of
+ dnl warnings when building modules.
+ if test "$ac_cv_prog_gnu_ld" = "yes"; then
+-	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1`
++	ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -n1`
+ 	AC_MSG_CHECKING(GNU ld release date)
+ 	changequote(,)dnl
+ 	ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
diff --git a/package/base/samba/samba.cache b/package/base/samba/samba.cache
new file mode 100644
index 000000000..c6c90cd94
--- /dev/null
+++ b/package/base/samba/samba.cache
@@ -0,0 +1,51 @@
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/sirkull/samba/samba.cache
+[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[TIMESTAMP] 1142500368 Thu Mar 16 10:12:48 2006 (5)
+[TIMESTAMP] 1142750984 Sun Mar 19 07:49:44 2006 (9)
+
+[CONFIG-ID] TRUNK-x86-reference
+[ROCKVER] TRUNK
+
+[LOGS] 5-samba.log 9-samba.log
+
+[BUILDTIME] 43856 (5)
+[BUILDTIME] 44866 (9)
+[SIZE] 40.96 MB, 586 files
+
+[DEP] 00-dirtree acl acl:dev attr attr:dev bash2 binutils bzip2 coreutils
+[DEP] cups cups:dev diffutils findutils gawk gcc34 gcc34:dev glibc23
+[DEP] glibc23:dev grep libcap:dev linux26-header:dev m4 make mktemp
+[DEP] ncurses:dev net-tools openldap openldap:dev openssl pam pam:dev
+[DEP] patch popt popt:dev readline readline:dev rrdtool sed sysfiles tar
+[DEP] util-linux valgrind:dev
+
+[PROVIDES] CP437.so CP850.so audit.so cap.so default_quota.so
+[PROVIDES] eventlogadm expand_msdfs.so extd_audit.so fake_perms.so
+[PROVIDES] findsmb full_audit.so libmsrpc.so libsmbclient.so mount.smbfs
+[PROVIDES] net netatalk.so nmbd nmblookup ntlm_auth pdbedit profiles
+[PROVIDES] readonly.so recycle.so rpcclient script.so shadow_copy.so
+[PROVIDES] smbadduser smbcacls smbclient smbcontrol smbcquotas smbd
+[PROVIDES] smbget smbmnt smbmount smbpasswd smbspool smbstatus smbtar
+[PROVIDES] smbtree smbumount swat tdbbackup tdbdump tdbtool testparm
+[PROVIDES] wbinfo winbindd
+
diff --git a/package/base/samba/samba.conf b/package/base/samba/samba.conf
new file mode 100644
index 000000000..8bdd8a398
--- /dev/null
+++ b/package/base/samba/samba.conf
@@ -0,0 +1,91 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/sirkull/samba/samba.conf
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ $prefix_auto = 1 ] ; then
+	prefix="opt/samba"
+	set_confopt
+fi
+
+var_append extraconfopt " " "--with-smbmount --with-automount \
+--with-syslog --with-configdir=$sysconfdir \
+--with-privatedir=$sysconfdir/private --with-codepagedir=$sysconfdir/codepages \
+--with-swatdir=$root/$prefix/share/swat --with-quotas --with-fhs \
+--with-acl-support --with-libsmbclient"
+
+var_append makeopt " " "LIBDIR=$root/$prefix/lib"
+var_append makeinstopt " " "LIBDIR=$root/$prefix/lib"
+
+var_append makeopt " " "LIBDIR=$root/$prefix/lib"
+var_append makeinstopt " " "LIBDIR=$root/$prefix/lib"
+
+if ! [ "$arch" = x86 -a "$ROCKCFG_X86_BITS" = "64" ] ; then
+	 var_append extraconfopt ' ' "--with-spinlocks"
+fi
+
+# pam support
+pkginstalled pam && var_append extraconfopt ' ' "--with-pam --with-pam_smbpass"
+
+# enable nis+ support
+var_append extraconfopt ' ' "--with-nisplus-home"
+
+# let samba configure find ldap and enable ldapsam
+if pkginstalled openldap; then
+	var_append extraconfopt ' ' "--with-ldapsam"
+	var_append extraconfopt ' ' "CFLAGS=\"$CFLAGS${CFLAGS:+ }-I$root/$pkg_openldap_prefix/include\""
+	var_append extraconfopt ' ' "CPPFLAGS=\"$CPPFLAGS${CPPFLAGS:+ }-I$root/$pkg_openldap_prefix/include\""
+	var_append extraconfopt ' ' "LDFLAGS=\"$LDFLAGS${LDFLAGS:+ }-L$root/$pkg_openldap_prefix/lib\""
+fi
+
+samba_pm ()
+{
+	install_init samba $confdir/samba.init
+	install_init smbmount $confdir/smbmount.init
+
+	[ -d $root/usr/lib/cups/backend/ ] && \
+		ln -sf $bindir/smbspool $root/usr/lib/cups/backend/smb
+ 
+	cp -vf smbadduser $bindir ; chmod 755 $bindir/smbadduser
+
+	cd ..
+	sed 's/;  encrypt passwords = yes/  encrypt passwords = yes/' \
+		examples/smb.conf.default > $docdir/smb.conf
+
+	cat > $sysconfdir/lmhosts <<'EOS'
+# ROCK Linux: Samba lmhosts
+#
+# This file contains host maps for NetBIOS
+# It is similar to the /etc/hosts file format
+# See lmhosts (5) for more info.
+#
+# Format is:
+# 0.0.0.0 NetBIOS_Name
+
+EOS
+}
+
+srcdir="samba-$ver/source"
+hook_add postmake 3 "samba_pm"
+hook_add postmake 3 "echo \"pkg_samba_prefix=$prefix\" \
+        > $root/var/adm/parse-config/samba"
+
+# these html files shouldn't go to :dev
+splitreg 90 . '/share/swat/include/'
diff --git a/package/base/samba/samba.desc b/package/base/samba/samba.desc
new file mode 100644
index 000000000..7e13015ba
--- /dev/null
+++ b/package/base/samba/samba.desc
@@ -0,0 +1,51 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/sirkull/samba/samba.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] Samba the SMB fileserver/client
+
+[T] Samba is a SMB server that runs on Unix and other operating
+[T] systems.  It allows these operating systems (currently Unix, Netware,
+[T] OS/2 and AmigaDOS) to act as a file and print server for SMB and CIFS
+[T] clients. There are many Lan-Manager compatible clients such as
+[T] LanManager for DOS, Windows for Workgroups, Windows NT, Windows 95,
+[T] Linux smbfs, OS/2, Pathworks and more.
+[T]
+[T] Please note that there are significant security implications to
+[T] running this server, and the smb.conf(5) manpage should be regarded
+[T] as mandatory reading before proceeding with installation.
+
+[U] http://www.samba.org/
+
+[A] Support <samba@samba.org> {Mail List}
+[M] Chris Efant <rock@sirkull.org>
+
+[C] extra/server
+[F] CORE
+
+[L] GPL
+[S] Stable
+[V] 3.0.21a
+[P] X -?---5---9 144.900
+
+[D] 2015240188 samba-3.0.21a.tar.gz ftp://de.samba.org/samba.org/
+
diff --git a/package/base/samba/samba.init b/package/base/samba/samba.init
new file mode 100644
index 000000000..d28cf4f1f
--- /dev/null
+++ b/package/base/samba/samba.init
@@ -0,0 +1,43 @@
+#!/bin/sh
+# 
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/sirkull/samba/samba.init
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# Desc: SMB (Server Message Block) protocol daemon
+# Runlevel: 40 rcX
+#
+
+test -f /etc/opt/samba/smb.conf || exit 0
+
+main_begin
+
+    block_begin(start, `Starting SAMBA server.')
+        check(`D_prefix/sbin/smbd -D')
+        check(`D_prefix/sbin/nmbd -D')
+    block_end
+
+    block_begin(stop, `Stopping SAMBA server.')
+       check(`killall -15 D_prefix/sbin/nmbd')
+       check(`killall -15 D_prefix/sbin/smbd')
+    block_end
+
+main_end
diff --git a/package/base/samba/smbmount.init b/package/base/samba/smbmount.init
new file mode 100644
index 000000000..669c1c690
--- /dev/null
+++ b/package/base/samba/smbmount.init
@@ -0,0 +1,39 @@
+#!/bin/sh
+# 
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/sirkull/samba/smbmount.init
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# Desc: mounting and unmounting for SMB shares
+# Runlevel: 75 rcX
+#
+
+main_begin
+
+    block_begin(start, `Starting SMB share mounting.')
+        check(`mount -av -t smbfs')
+    block_end
+
+    block_begin(stop, `Stopping SMB share mounting.')
+       check(`umount -av -t smbfs')
+    block_end
+
+main_end