diff --git a/BaseBuild/Basesys/ncurses b/BaseBuild/Basesys/ncurses
index 2cfa5e9..8998ca7 100644
--- a/BaseBuild/Basesys/ncurses
+++ b/BaseBuild/Basesys/ncurses
@@ -69,9 +69,12 @@
 #Version der Datei: $Revision$
 #
 
+#(( MKPKG = $MKPKG | 128 ))
+
 SRCPATH=Base/lib
 
 premk() {
+	#SrcPatch $MAKEDIR/ncurses* $LFSSOURCE/$SRCPATH/ncurses-*-branch_update-2.patch*
 	mkdir $TMPROOT/usr $TMPROOT/usr/lib $TMPROOT/usr/share $TMPROOT/lib
 	mkdir ../build-ncurses
 	cd ../build-ncurses
@@ -87,6 +90,8 @@ mk32() {
 	make 
 	make install
 	make DESTDIR=$TMPROOT install
+	mv -v $TMPROOT/usr/bin/ncurses5-config{,-32}
+	mv -v /usr/bin/ncurses5-config{,-32}
 	cd ../ncurses*
 	rm -r ../build-ncurses
 	mkdir ../build-ncurses
@@ -111,8 +116,18 @@ mk() {
 }
 
 postmk() {
+	mv -v $TMPROOT/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+	      $TMPROOT/usr/lib
+	mv -v /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+	      /usr/lib
 	rm -v $TMPROOT/lib/lib{ncurses,menu,panel,form,curses}.so
+	rm -v /lib/lib{ncurses,menu,panel,form,curses}.so
 	mkdir -p $TMPROOT/usr/lib
+	ln -svf ../../lib/libncurses.so.5 /usr/lib/libcurses.so
+	ln -svf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
+	ln -svf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
+	ln -svf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
+	ln -svf ../../lib/libform.so.5 /usr/lib/libform.so
 	ln -svf ../../lib/libncurses.so.5 $TMPROOT/usr/lib/libcurses.so
 	ln -svf ../../lib/libncurses.so.5 $TMPROOT/usr/lib/libncurses.so
 	ln -svf ../../lib/libmenu.so.5 $TMPROOT/usr/lib/libmenu.so
@@ -120,8 +135,22 @@ postmk() {
 	ln -svf ../../lib/libform.so.5 $TMPROOT/usr/lib/libform.so
 	chmod -v 755 $TMPROOT/lib/lib{panel,menu,panel,form,ncurses}.so.5.5
 	if [ "$MK64BIT" == "true" ]; then
+	  mv $TMPROOT/usr/bin/ncurses5-config{,-64}
+	  mv /usr/bin/ncurses5-config{,-64}
+	  ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/ncurses5-config
+	  ln -sv /usr/bin/multiarch_wrapper /usr/bin/ncurses5-config
 	  mkdir -p $TMPROOT/usr/lib64
+	  mv -v $TMPROOT/lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+	      $TMPROOT/usr/lib64
+	  mv -v /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+	        /usr/lib64
 	  rm -v $TMPROOT/lib64/lib{ncurses,menu,panel,form,curses}.so
+	  rm -v /lib64/lib{ncurses,menu,panel,form,curses}.so
+	  ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so
+	  ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
+	  ln -svf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so
+	  ln -svf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so
+	  ln -svf ../../lib64/libform.so.5 /usr/lib64/libform.so
 	  ln -svf ../../lib64/libncurses.so.5 $TMPROOT/usr/lib64/libcurses.so
 	  ln -svf ../../lib64/libncurses.so.5 $TMPROOT/usr/lib64/libncurses.so
 	  ln -svf ../../lib64/libmenu.so.5 $TMPROOT/usr/lib64/libmenu.so