diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 694823e3d..75a0cc2c2 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -2,6 +2,7 @@
 *) 2003-12-20 (2.0.0-rc3 - 2.0.0-rc4)
 
  - enable apache's mod_deflate
+ - cleaned kiss.conf
 
 *) 2003-12-28 (2.0.0-rc3 - 2.0.0-rc4)
 
diff --git a/package/base/kiss/eject_feature.patch b/package/base/kiss/eject_feature.patch
index 894b1ad13..3378961de 100644
--- a/package/base/kiss/eject_feature.patch
+++ b/package/base/kiss/eject_feature.patch
@@ -4,8 +4,8 @@ laptops (e.g. Apple ones) ...
 
   - Rene Rebe <rene@rocklinux.org>
 
---- src/Makefile	1998-09-25 14:07:09.000000000 +0200
-+++ src/Makefile	2003-12-24 21:47:07.000000000 +0100
+--- ./src/Makefile	1998-09-25 14:07:09.000000000 +0200
++++ ./src/Makefile	2003-12-24 21:47:07.000000000 +0100
 @@ -66,7 +66,7 @@
        addstringstack.o expandtilde.o splitcmd.o addstringtostack.o \
        dokill.o dogrep.o dochown.o dosleep.o expandbackquotes.o dols.o \
@@ -15,8 +15,8 @@ laptops (e.g. Apple ones) ...
  
  # entry point for making
  foo:
---- src/doeject.c	1970-01-01 01:00:00.000000000 +0100
-+++ src/doeject.c	2003-12-24 22:03:09.000000000 +0100
+--- ./src/doeject.c	1970-01-01 01:00:00.000000000 +0100
++++ ./src/doeject.c	2003-12-24 22:03:09.000000000 +0100
 @@ -0,0 +1,33 @@
 +#include "kiss.h"
 +
@@ -51,8 +51,8 @@ laptops (e.g. Apple ones) ...
 +    }
 +    return (0);
 +}
---- src/kiss.c	1998-09-25 14:07:10.000000000 +0200
-+++ src/kiss.c	2003-12-24 21:34:31.000000000 +0100
+--- ./src/kiss.c	1998-09-25 14:07:10.000000000 +0200
++++ ./src/kiss.c	2003-12-24 21:34:31.000000000 +0100
 @@ -32,6 +32,7 @@
      { "chown",	    dochown,		0 },
      { "cp",	    docp,		0 },
@@ -61,8 +61,8 @@ laptops (e.g. Apple ones) ...
      { "exec",	    doexec,		1 },
      { "exit",	    doquit,		1 },
      { "grep",	    dogrep,		0 },
---- srx/kiss.h	1998-09-25 14:07:10.000000000 +0200
-+++ src/kiss.h	2003-12-24 21:33:24.000000000 +0100
+--- ./srx/kiss.h	1998-09-25 14:07:10.000000000 +0200
++++ ./src/kiss.h	2003-12-24 21:33:24.000000000 +0100
 @@ -194,6 +194,7 @@
  extern int dochown (Stringstack s);
  extern int docp (Stringstack s);
diff --git a/package/base/kiss/hotfix.patch b/package/base/kiss/hotfix.patch
index 4ef2aef22..5615105c2 100644
--- a/package/base/kiss/hotfix.patch
+++ b/package/base/kiss/hotfix.patch
@@ -20,8 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./doprintenv.c.old    Fri Oct 24 20:39:28 1997
-+++ ./doprintenv.c        Tue May 26 09:49:34 1998
+--- ./src/doprintenv.c.old    Fri Oct 24 20:39:28 1997
++++ ./src/doprintenv.c        Tue May 26 09:49:34 1998
 @@ -1,5 +1,7 @@
  #include "kiss.h"
 
diff --git a/package/base/kiss/kiss.conf b/package/base/kiss/kiss.conf
index 8d63dbcc7..0c88b9015 100644
--- a/package/base/kiss/kiss.conf
+++ b/package/base/kiss/kiss.conf
@@ -20,23 +20,33 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-main_kiss() {
+kiss_extract() {
 	echo "Extracting double-compressed kiss-$ver.tar.gz.bz2 ... "
 	bunzip2 -dc $archdir/kiss-$ver.tar.gz.bz2 > $builddir/kiss-$ver.tar.gz
 	tar -xzf $builddir/kiss-$ver.tar.gz
-	cd kiss-$ver/src
+	cd kiss-$ver
 
+	hook_eval prepatch
 	apply_patchfiles
+	hook_eval postpatch
 
-	eval "$MAKE CC="$CC" STDLFLAGS='-s -static' bkiss"
-	
+	cd src
+}
+
+kiss_pi() {
 	cp bkiss $root/bin/kiss
 	cd ..
-	cp ChangeLog doc/* $docdir
-	cp kiss.README kiss.lsm $docdir
-	chmod 0644 $docdir/*
+	for x in ChangeLog doc/* kiss.README kiss.lsm ; do
+		chmod 0644 $x
+		cp $x $docdir/
+	done
 }
 
-custmain="main_kiss"
 autoextract=0
 
+hook_add preconf 1 "kiss_extract"
+hook_add postmake 3 "kiss_pi"
+
+makeopt="CC='$CC' STDLFLAGS='-s -static' bkiss"
+makeinstopt=""
+
diff --git a/package/base/kiss/mount_typo_features.patch b/package/base/kiss/mount_typo_features.patch
index 56a2815f8..eb3d1191e 100644
--- a/package/base/kiss/mount_typo_features.patch
+++ b/package/base/kiss/mount_typo_features.patch
@@ -7,8 +7,8 @@ as a remount possibility in rescue conditions ;-)
 
   - Rene Rebe <rene@rocklinux.org>
 
---- src/domount.c	1998-09-25 14:07:09.000000000 +0200
-+++ src/domount.c	2003-12-24 16:16:17.000000000 +0100
+--- ./src/domount.c	1998-09-25 14:07:09.000000000 +0200
++++ ./src/domount.c	2003-12-24 16:16:17.000000000 +0100
 @@ -2,27 +2,34 @@
  
  int domount (Stringstack s)
diff --git a/package/base/kiss/posix-fixes.patch b/package/base/kiss/posix-fixes.patch
index 835baa614..ae0a50202 100644
--- a/package/base/kiss/posix-fixes.patch
+++ b/package/base/kiss/posix-fixes.patch
@@ -27,8 +27,8 @@ and more secure.
   Rene Rebe <rene@rocklinux.org>
 
 diff -ur kiss-0.21/src/doread.c src.kiss.-1.25906.3396530713/kiss-0.21/src/doread.c
---- kiss-0.21/doread.c	1998-09-25 14:07:09.000000000 +0200
-+++ kiss-0.21/doread.c	2003-08-17 23:54:10.000000000 +0200
+--- kiss-0.21/src/doread.c	1998-09-25 14:07:09.000000000 +0200
++++ kiss-0.21/src/doread.c	2003-08-17 23:54:10.000000000 +0200
 @@ -17,11 +17,11 @@
  	for (cp = s.str [1]; *cp; cp++)
  	    if (! isupper (*cp))
@@ -44,8 +44,8 @@ diff -ur kiss-0.21/src/doread.c src.kiss.-1.25906.3396530713/kiss-0.21/src/dorea
      return (0);
  }
 diff -ur kiss-0.21/src/runcmd.c src.kiss.-1.25906.3396530713/kiss-0.21/src/runcmd.c
---- kiss-0.21/runcmd.c	1998-09-25 14:07:10.000000000 +0200
-+++ kiss-0.21/runcmd.c	2003-08-17 23:11:35.000000000 +0200
+--- kiss-0.21/src/runcmd.c	1998-09-25 14:07:10.000000000 +0200
++++ kiss-0.21/src/runcmd.c	2003-08-17 23:11:35.000000000 +0200
 @@ -1,5 +1,7 @@
  #include "kiss.h"