diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 23bc312c3..09fb93e65 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -2,6 +2,7 @@
 *) 2003-08-30 (2.0.0-rc1 - 2.0.0-rc2)
 
  - added bash version checkk to System-Check
+ - Daniel Jahre: merged first parts for realtime (RTAI) support
 
 *) 2003-08-29 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/package/daja77/rtai/config.in b/package/daja77/rtai/config.in
new file mode 100644
index 000000000..01c542b3e
--- /dev/null
+++ b/package/daja77/rtai/config.in
@@ -0,0 +1,49 @@
+
+menu_begin MENU_RTAI_Options 'Realtime Options'
+
+   bool "Enable real time support" ROCKCFG_REALTIME 0
+
+if [ $ROCKCFG_REALTIME = "1" ]; then
+   pkgenable rtai
+
+   choice ROCKCFG_RTAI_PATCH rthal5g \
+	rthal5g "Use RTHAL patch" \
+	adeos "Use ADEOS patch" 
+
+   bool  "Uni Processor Scheduler" ROCKCFG_RTAI_SCHED_UP 1
+   bool  "SMP Scheduler" ROCKCFG_RTAI_SCHED_SMP 1
+   bool  "MUP Scheduler" ROCKCFG_RTAI_SCHED_MUP 1
+
+   text "Number of CPUS" ROCKCFG_RTAI_CPUS 2 
+   bool "Enable RTAI FPU support" ROCKCFG_RTAI_FPU_SUPPORT 1
+   bool "Using RTAI math library" ROCKCFG_RTAI_LIBM 1
+   bool "Strange APIC support" ROCKCFG_RTAI_STRANGE_APIC 1
+   bool "POSIX Threading API support" ROCKCFG_RTAI_POSIX 1
+   bool "Compile RT memory manager as module" ROCKCFG_RTAI_DYN_MM 0
+   bool "Use vmalloc() instead of kmalloc()" ROCKCFG_RTAI_MM_VMALLOC 0
+   bool "RTAI FIFOS" ROCKCFG_RTAI_FIFOS 1
+   bool "Shared Memory support" ROCKCFG_RTAI_SHMEM 1
+   bool "RTAI watchdog support" ROCKCFG_RTAI_WATCHDOG 1
+   bool "RTAI LXRT" ROCKCFG_RTAI_LXRT 1
+   bool "RTAI NEWLXRT" ROCKCFG_RTAI_NEWLXRT 1
+   bool "LXRT rt_com driver" ROCKCFG_RTAI_RTCOM_LXRT 1
+   bool "LXRT FIFOS" ROCKCFG_RTAI_FIFOS_LXRT 1
+   bool "COMEDI LXRT" ROCKCFG_RTAI_COMEDI_LXRT 1
+   bool "C++ support" ROCKCFG_RTAI_CPLUSPLUS 1
+   bool "New C++ Interface" ROCKCFG_RTAI_NEW_CPP 1
+   bool "Tasklets" ROCKCFG_RTAI_TASKLETS 0
+   bool "User space interrupts" ROCKCFG_RTAI_USI 1
+   bool "Bits" ROCKCFG_RTAI_BITS 1
+   bool "typed mail boxes"  ROCKCFG_RTAI_TBX 1 
+   bool "Real-Time serial driver (rt_com)" ROCKCFG_RTAI_RTCOM 0
+   bool "Real-Time serial driver (spdrv)" ROCKCFG_RTAI_SPDRV 0
+   bool "rtai netrpc" ROCKCFG_RTAI_NETRPC 0
+   bool "Real-Time Networking" ROCKCFG_RTAI_RTNET 0
+   bool "Compile tests" ROCKCFG_RTAI_TESTS 1
+   bool "Compile examples" ROCKCFG_RTAI_EXAMPLES 1
+   bool "Compile lxrt examples" ROCKCFG_RTAI_LXRT_EXAMPLES 1
+   bool "RTnet task" ROCKCFG_RTAI_RTNET_TASK 0
+fi
+
+menu_end
+
diff --git a/package/daja77/rtai/parse-config-9 b/package/daja77/rtai/parse-config-9
new file mode 100644
index 000000000..f4c96a8e1
--- /dev/null
+++ b/package/daja77/rtai/parse-config-9
@@ -0,0 +1,19 @@
+if [ $ROCKCFG_REALTIME = "1" ]; then
+	if [ $ROCKCFG_RTAI_PATCH="rthal5g" ]; then
+		if [ $pkg = "linux24" ] ; then
+		var_append patchfiles " " $base/package/daja77/rtai/kernel-patches/rthal5g.patch
+		fi
+		if [ $pkg = "linux24-src" ] ; then
+		var_append patchfiles " " $base/package/daja77/rtai/kernel-patches/rthal5g.patch
+		fi
+	fi
+#	if [ $ROCKCFG_RTAI_PATCH="adeos" ]; then
+#		if [ $pkg = "linux24" ] ; then
+#		var_append patchfiles " " $base/package/daja77/rtai/kernel-patches/adeos.patch
+#		fi
+#		if [ $pkg = "linux24-src" ] ; then
+#		var_append patchfiles " " $base/package/daja77/rtai/kernel-patches/adeos.patch
+#		fi
+#	fi
+fi
+
diff --git a/package/daja77/rtai/rtai.conf b/package/daja77/rtai/rtai.conf
new file mode 100644
index 000000000..b0aebd901
--- /dev/null
+++ b/package/daja77/rtai/rtai.conf
@@ -0,0 +1,274 @@
+
+# --- 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/blindcoder/bzflag/bzflag.conf
+# ROCK Linux is Copyright (C) 1998 - 2003 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 ---
+
+
+create_config() {
+	if [ $ROCKCFG_RTAI_PATCH="rthal5g" ]; then
+		echo "CONFIG_RTAI_RTHAL=y" >> .config
+		echo "define_bool CONFIG_RTAI_RTHAL y" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_ADEOS n" >> scripts/config.in
+		export INSTALL_MOD_PATH=$root/lib/modules/2.4.20/build
+	else
+		echo "CONFIG_RTAI_ADEOS=y" >> .config
+		echo "define_bool CONFIG_RTAI_RTHAL n" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_ADEOS y" >> scripts/config.in
+		export INSTALL_MOD_PATH=$root/lib/modules/2.4.20/build
+	fi
+
+	echo "CONFIG_RTAI=m" >> .config
+	echo "define_bool CONFIG_RTAI m" >> scripts/config.in
+
+	echo "CONFIG_RTAI_MOUNT_ON_LOAD=y" >> .config
+	echo "define_bool CONFIG_RTAI_MOUNT_ON_LOAD y" >> config.in
+
+	echo "CONFIG_RTAI_LINUX24=y" >> .config
+	echo "define_bool CONFIG_RTAI_LINUX24 y" >> scripts/config.in
+	echo "define_bool CONFIG_RTAI_LINUX22 n" >> scripts/config.in
+
+	echo "CONFIG_RTAI_EXPERIMENTAL=y" >> .config
+
+	if [ $ROCKCFG_RTAI_SCHED_UP = "1" ]; then
+		echo "CONFIG_RTAI_SCHED_UP=m" >> .config
+		echo "define_tristate CONFIG_RTAI_SCHED_UP m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_SCHED_UP n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_SCHED_SMP = "1" ]; then
+		echo "CONFIG_RTAI_SCHED_SMP=m" >> .config
+		echo "define_tristate CONFIG_RTAI_SCHED_SMP m" >> scripts/config.in
+	else	
+		echo "define_tristate CONFIG_RTAI_SCHED_SMP n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_SCHED_MUP = "1" ]; then
+		echo "CONFIG_RTAI_SCHED_MUP=m" >> .config
+		echo "define_tristate CONFIG_RTAI_SCHED_MUP m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_SCHED_MUP n" >> scripts/config.in
+	fi
+
+	echo "CONFIG_RTAI_CPUS=$ROCKCFG_RTAI_CPUS" >> .config
+	echo "define_int CONFIG_RTAI_CPUS $ROCKCFG_RTAI_CPUS" >> scripts/config.in
+
+	if [ $ROCKCFG_RTAI_FPU_SUPPORT = 1 ]; then
+		echo "CONFIG_RTAI_FPU_SUPPORT=y" >> .config
+		echo "define_bool CONFIG_RTAI_FPU y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_FPU n" >> scripts/config.in
+	fi
+	
+	if [ $ROCKCFG_RTAI_LIBM = 1 ]; then
+		echo "CONFIG_RTAI_LIBM=y" >> .config
+		echo "define_tristate CONFIG_RTAI_LIBM y" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_LIBM n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_STRANGE_APIC = 1 ]; then
+		echo "CONFIG_RTAI_STRANGE_APIC=y" >> .config
+		echo "define_bool CONFIG_RTAI_STRANGE_APIC y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_STRANGE_APIC n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_DYN_MM = 1 ]; then
+		echo "CONFIG_RTAI_DYN_MM=m" >> .config
+		echo "echo define_tristate CONFIG_RTAI_DYN_MM m" >> scripts/config.in
+	else
+		echo "CONFIG_RTAI_DYN_MM=y" >> .config
+		echo "echo define_tristate CONFIG_RTAI_DYN_MM y" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_MM_VMALLOC = 1 ]; then
+		echo "CONFIG_RTAI_MM_VMALLOC=y" >> .config
+		echo "define_bool CONFIG_RTAI_MM_VMALLOC y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_MM_VMALLOC n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_FIFOS = 1 ]; then
+		echo "CONFIG_RTAI_FIFOS=m" >> .config
+		echo "define_tristate CONFIG_RTAI_FIFOS m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_FIFOS n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_SHMEM = 1 ]; then
+		echo "CONFIG_RTAI_SHMEM=m" >> .config
+		echo "define_tristate CONFIG_RTAI_SHMEM m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_SHMEM n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_POSIX = 1 ]; then
+		echo "CONFIG_RTAI_POSIX=m" >> .config
+		echo "define_tristate CONFIG_RTAI_POSIX m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_POSIX n" >> scripts/config.in
+	fi
+	
+	if [ $ROCKCFG_RTAI_WATCHDOG = 1 ]; then
+		echo "CONFIG_RTAI_WATCHDOG=m" >> .config
+		echo "define_tristate CONFIG_RTAI_WATCHDOG m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_WATCHDOG n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_LXRT = 1 ]; then
+		echo "CONFIG_RTAI_LXRT=m" >> .config
+		echo "define_tristate CONFIG_RTAI_LXRT m" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_KTRD y" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_NOKTRD n" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_LXRT n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_NEWLXRT = 1 ]; then
+		echo "CONFIG_RTAI_NEWLXRT=m" >> .config
+		echo "CONFIG_RTAI_NEWLXRT_NOBUDDY=y" >> .config
+		echo "define_tristate CONFIG_RTAI_NEWLXRT m" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_NOBUDDY y" >> scripts/config.in
+		echo "define_bool CONFIG_RTAI_BUDDY n" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_NEWLXRT n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_RTCOM_LXRT = 1 ]; then
+		echo "CONFIG_RTAI_RTCOM_LXRT=m" >> .config
+		echo "define_tristate CONFIG_RTAI_RTCOM_LXRT m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_RTCOM_LXRT n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_FIFOS_LXRT = 1 ]; then
+		echo "CONFIG_RTAI_FIFOS_LXRT=m" >> .config
+		echo "define_tristate CONFIG_RTAI_FIFOS_LXRT m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_FIFOS_LXRT n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_COMEDI_LXRT = 1 ]; then 
+		echo "CONFIG_RTAI_COMEDI_LXRT=m" >> .config
+		echo "define_trisate CONFIG_RTAI_COMEDI_LXRT m" >> scripts/config.in
+	else
+		echo "define_trisate CONFIG_RTAI_COMEDI_LXRT n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_CPLUSPLUS = 1 ]; then
+		echo "CONFIG_RTAI_CPLUSPLUS=m" >> .config
+		echo "define_tristate CONFIG_RTAI_CPLUSPLUS m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_CPLUSPLUS n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_NEW_CPP = 1 ]; then
+		echo "CONFIG_RTAI_NEW_CPP=m" >> .config
+		echo "define_bool CONFIG_RTAI_NEW_CPP m" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_NEW_CPP n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_TASKLETS = 1 ]; then
+		echo "CONFIG_RTAI_TASKLETS=m" >> .config
+		echo "define_tristate CONFIG_RTAI_TASKLETS m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_TASKLETS n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_BITS = 1 ]; then
+		echo "CONFIG_RTAI_BITS=m" >> .config
+		echo "define_tristate CONFIG_RTAI_BITS m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_BITS n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_TBX = 1 ]; then
+		echo "CONFIG_RTAI_TBX=m" >> .config
+	fi
+
+	if [ $ROCKCFG_RTAI_RTCOM = 1 ]; then 
+		echo "CONFIG_RTAI_RTCOM=m" >> .config
+		echo "define_tristate CONFIG_RTAI_RTCOM m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_RTCOM n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_SPDRV = 1 ]; then
+		echo "CONFIG_RTAI_SPDRV=m" >> .config
+		echo "define_tristate CONFIG_RTAI_SPDRV m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_SPDRV n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_NETRPC = 1 ]; then
+		echo "CONFIG_RTAI_NETRPC=m" >> .config
+		echo "define_tristate CONFIG_RTAI_NETRPC m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_NETRPC n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_RTNET = 1 ]; then
+		echo "CONFIG_RTAI_RTNET=m" >> .config
+		echo "define_tristate CONFIG_RTAI_RTNET m" >> scripts/config.in
+	else
+		echo "define_tristate CONFIG_RTAI_RTNET n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_EXAMPLES = 1 ]; then
+		echo "CONFIG_RTAI_EXAMPLES=y" >> .config
+		echo "define_bool CONFIG_RTAI_EXAMPLES y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_EXAMPLES n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_LXRT_EXAMPLES = 1 ]; then
+		echo "CONFIG_RTAI_LXRT_EXAMPLES=y" >> .config
+		echo "define_bool CONFIG_RTAI_LXRT_EXAMPLES y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_LXRT_EXAMPLES n" >> scripts/config.in
+	fi
+
+	if [ $ROCKCFG_RTAI_TESTS = 1 ]; then
+		echo "CONFIG_RTAI_TESTS=y" >> .config
+		echo "define_bool CONFIG_RTAI_TESTS y" >> scripts/config.in
+	else
+		echo "define_bool CONFIG_RTAI_TESTS n" >> scripts/config.in
+	fi
+}
+
+rtai_main() {
+	current_dir=`pwd`
+	#cd $root/usr/src/linux-2.4.21-rock
+	#make dep
+	#cd $current_dir
+	rm -rf scripts/config.in
+	create_config
+	eval ./configure --linuxdir $root/usr/src/linux-2.4.21-rock --non-interactive
+	eval make
+	eval make install
+	mkdir -p /usr/include/rtai
+	cp -r include/* /usr/include/rtai
+}
+
+custmain="rtai_main"
diff --git a/package/daja77/rtai/rtai.desc b/package/daja77/rtai/rtai.desc
new file mode 100644
index 000000000..49c07f028
--- /dev/null
+++ b/package/daja77/rtai/rtai.desc
@@ -0,0 +1,42 @@
+
+[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/base/dietlibc/dietlibc.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2003 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] Realtime Linux Application Interface for Linux
+
+[T] The diet libc is a libc that is optimized for small size. It can be
+[T] used to create small statically linked binaries for Linux on alpha,
+[T] arm, hppa, mips, s390, sparc, ppc and i386.
+
+[U] http://www.rtai.org
+
+[A] Paolo Mantegazza 
+[M] Daniel Jahre <rock@lospalmos.net>
+
+[C] base/kernel
+
+[L] GPL
+[S] Stable
+[V] 24.1.11
+[P] O -----5---9 107.800
+
+[D] 0 rtai-24.1.11.tgz  http://www.aero.polimi.it/RTAI/