diff --git a/network/samba/samba.conf b/network/samba/samba.conf
index 1331f473d..6cc6315d3 100644
--- a/network/samba/samba.conf
+++ b/network/samba/samba.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../samba/samba.conf
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2011 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -15,8 +15,10 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 if [ $prefix_auto = 1 ] ; then
-	prefix="opt/samba"
-	set_confopt
+	# use a dedicated sysconfdir instead of installing into /etc
+	sysconfdir="$sysconfdir/$pkg"
+	# use a dedicated datadir
+	datadir="$datadir/$pkg"
 fi
 
 var_append extraconfopt " " "--with-smbmount --with-cifsmount --with-automount \