diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 20a9fc226..5fb91a28f 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -6,6 +6,9 @@ whole rxr-tree.
 
  - fixed zlib to only install into $root/... and refactored the code
  - first *-cross iteration (mostly for a sparc64 kernel on sparc(32))
+ - blacklisted a driver not compiling in 2.6
+ - refactored coda
+ - fixed samba
 
 *) 2003-08-01 (2.0.0-beta7 - 2.0.0-rc1) 
 
diff --git a/package/base/linux26/disable-broken.lst b/package/base/linux26/disable-broken.lst
index 22a57e7b2..4c1946f82 100644
--- a/package/base/linux26/disable-broken.lst
+++ b/package/base/linux26/disable-broken.lst
@@ -61,3 +61,5 @@ CONFIG_FB_PM2			2003-07-07	2.5.74
 CONFIG_FB_PM3			2003-07-07	2.5.74
 CONFIG_FB_CIRRUS		2003-07-07	2.5.74
 
+CONFIG_ARCNET_COM20020		2003-08-02	2.6.0-test2
+
diff --git a/package/rene/coda/coda.conf b/package/rene/coda/coda.conf
index 5dc6b47b4..5d59186b7 100644
--- a/package/rene/coda/coda.conf
+++ b/package/rene/coda/coda.conf
@@ -20,46 +20,29 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-coda_main()
-{
-	echo "Extracting source ..."
-	tar $taropt $archdir/lwp-1.9.tar.bz2
-	tar $taropt $archdir/rvm-1.7.tar.bz2
-	tar $taropt $archdir/rpc2-1.14.tar.bz2
-	tar $taropt $archdir/coda-$ver.tar.bz2
-	
+if [ $prefix_auto = 1 ] ; then
+	prefix="opt/coda"
+fi
+
+set_confopt
+
+code_pc(){
 	export PATH="$PATH:/opt/coda/bin:/opt/coda/sbin"
-	
-	cd lwp-1.9
-	./configure --prefix=/opt/coda
-	eval $MAKE ; eval $MAKE install
-	cd ..
-	
-	cd rvm-1.7
-	./configure --prefix=/opt/coda
-	eval $MAKE ; eval $MAKE install
-	cd ..
-	 
-	cd rpc2-1.14
-	./configure --prefix=/opt/coda
-	eval $MAKE ; eval $MAKE install
-	cd ..
-	 
-	cd coda-$ver
-	./configure --prefix=/opt/coda
-	yacc -d coda-src/asr/resolver_parser.y -o coda-src/asr/resolver_parser.c
-	patch -p1 < $confdir/yacc-fix.patch.manual
-	eval $MAKE ; eval $MAKE client-install server-install
-	cd ..
-	
+
+	if [[ $xsrctar = *coda* ]] ; then
+		yacc -d coda-src/asr/resolver_parser.y \
+		     -o coda-src/asr/resolver_parser.c
+		patch -p1 < $confdir/yacc-fix.patch.manual
+		var_append makeinstopt "client-install server-install"
+	fi
+}
+
+coda_pi(){ 
 	install_init coda-utils $confdir/coda-utils.init
 	install_init coda-server $confdir/coda-server.init
 	install_init coda-client $confdir/coda-client.init
 }
 
-custmain="coda_main"
-
-autoextract=0
+hook_add preconf 3 code_pc
+hook_add postinstall 3 coda_pm
 
-[ "$ver" != "5.3.20" ] &&
-  abort "New version -> The file 'coda.conf' must be updated!"
diff --git a/package/rene/coda/coda.desc b/package/rene/coda/coda.desc
index 669b0c6d9..f5cea2276 100644
--- a/package/rene/coda/coda.desc
+++ b/package/rene/coda/coda.desc
@@ -56,6 +56,8 @@
 [V] 5.3.20
 [P] X -----5---9 783.000
 
+[SRC] lwp rvm rpc2 coda
+
 [D] 2309207819 lwp-1.9.tar.gz ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/
 [D] 1685598205 rvm-1.7.tar.gz ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/
 [D] 487348515 rpc2-1.14.tar.gz ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/
diff --git a/package/rene/samba/samba.conf b/package/rene/samba/samba.conf
index e881eb924..09225debb 100644
--- a/package/rene/samba/samba.conf
+++ b/package/rene/samba/samba.conf
@@ -33,6 +33,7 @@ samba_pm ()
  
 	cp script/smbadduser $bindir
 
+	cd ..
 	sed 's/;  encrypt passwords = yes/  encrypt passwords = yes/' \
 		examples/smb.conf.default > $sysconfdir/smb.conf