diff --git a/SysBuild/tools/clucene-core b/SysBuild/tools/clucene-core
index ae8856c..2024c62 100644
--- a/SysBuild/tools/clucene-core
+++ b/SysBuild/tools/clucene-core
@@ -3,7 +3,7 @@
 #dieses Framework wird im CVS Repository
 #:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt
 #
-#Lage dieser Datei im Archiv: $HeadURL: $
+#Lage dieser Datei im Archiv: $HeadURL$
 #
 #(c) 2003 Harald Kueller, Germany
 #This program is free software; you can redistribute it and/or
@@ -78,40 +78,27 @@ premk() {
 }
 
 mk32() {
-	mkdir -v build &&
-	cd build &&
+	CC="gcc $BUILDOPTIONS32" \
+	CXX="g++ $BUILDOPTIONS32" \
 	USE_ARCH=32 \
-	CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
-	CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
-	      -DLIB_SUFFIX= \
-	      .. &&
+	./configure --target=$TARGET32 \
+		    --prefix=/usr
 	make -j $NUMCPU
-	make DESTDIR=$TMPROOT install
-	cd ..
-	rm -r build
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="-DLIB_SUFFIX=64"
-	fi
-	mkdir -v build
-	cd build
 	CC="gcc $BUILDOPTIONS -fPIC" \
 	CXX="g++ $BUILDOPTIONS -fPIC" \
 	USE_ARCH=$UARCH \
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	      -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
-	      -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
-	      $ADDOPTIONS \
-	      .. &&
+	./configure --target=$TARGET \
+		    --libdir=\${prefix}/${LIBDIR} \
+		    --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	if [ "$MK64BIT" == "true" ]; then
+		GenDynLib $TMPROOT/usr/lib64/libclucene.a 0.0.0
+	fi
 }
 
 postmk() {