diff --git a/package/nikolaus/cheapskatefonts/cheapskatefonts.desc b/package/nikolaus/cheapskatefonts/cheapskatefonts.desc
index 4d84703d3..2370b243a 100644
--- a/package/nikolaus/cheapskatefonts/cheapskatefonts.desc
+++ b/package/nikolaus/cheapskatefonts/cheapskatefonts.desc
@@ -30,7 +30,6 @@
 [M] Nikolaus Filus <NFilus@gmx.net>
 
 [C] extra/font
-[E] add x11
 
 [L] GPL
 [S] Stable
diff --git a/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc b/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc
index 45931917a..dbd2c0788 100644
--- a/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc
+++ b/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc
@@ -32,7 +32,6 @@
 [M] Rene Rebe <rene@rocklinux.org>
 
 [C] base/x11
-[E] add x11
 
 [L] OpenSource
 [S] Stable
diff --git a/package/rene/gpl-fonts/gpl-fonts.desc b/package/rene/gpl-fonts/gpl-fonts.desc
index 97a9c6318..27b14a47d 100644
--- a/package/rene/gpl-fonts/gpl-fonts.desc
+++ b/package/rene/gpl-fonts/gpl-fonts.desc
@@ -32,7 +32,6 @@
 [M] Rene Rebe <rene@rocklinux.org>
 
 [C] extra/multimedia
-[E] add x11
 
 [L] GPL
 [S] Stable
diff --git a/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc b/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc
index 9fa069879..f8c5d8c87 100644
--- a/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc
+++ b/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc
@@ -49,7 +49,6 @@
 [M] Rene Rebe <rene@rocklinux.org>
 
 [C] extra/multimedia
-[E] add x11
 
 [L] Free-to-use
 [S] Stable
diff --git a/package/rene/tex-ttf/tex-ttf.desc b/package/rene/tex-ttf/tex-ttf.desc
index 83454b933..75998c48a 100644
--- a/package/rene/tex-ttf/tex-ttf.desc
+++ b/package/rene/tex-ttf/tex-ttf.desc
@@ -37,7 +37,6 @@
 [M] René Rebe <rene@rocklinux.org>
 
 [C] extra/office
-[E] add x11
 
 [L] OpenSource
 [S] Alpha
diff --git a/package/rene/tuxcursor/tuxcursor.desc b/package/rene/tuxcursor/tuxcursor.desc
index c45a86048..1dedc9d08 100644
--- a/package/rene/tuxcursor/tuxcursor.desc
+++ b/package/rene/tuxcursor/tuxcursor.desc
@@ -33,7 +33,6 @@
 
 [L] OpenSource
 [C] extra/icon
-[E] add x11
 
 [S] Stable
 [L] GPL
diff --git a/package/rene/xemacs-packages/xemacs-packages.desc b/package/rene/xemacs-packages/xemacs-packages.desc
index 0ca305e9d..05fd45d94 100644
--- a/package/rene/xemacs-packages/xemacs-packages.desc
+++ b/package/rene/xemacs-packages/xemacs-packages.desc
@@ -30,7 +30,6 @@
 [M] Rene Rebe <rene@rocklinux.org>
 
 [C] extra/editor extra/office
-[E] add xemacs
 
 [L] Free-to-use
 [S] Stable
diff --git a/package/x11/freefonts/freefonts.desc b/package/x11/freefonts/freefonts.desc
index 7192c677a..257fb437b 100644
--- a/package/x11/freefonts/freefonts.desc
+++ b/package/x11/freefonts/freefonts.desc
@@ -34,7 +34,6 @@
 [M] Rene Rebe <rene@rocklinux.org>
 
 [C] base/x11
-[E] add x11
 
 [L] Free-to-use
 [S] Stable
diff --git a/package/x11/ghostscript-fonts/ghostscript-fonts.desc b/package/x11/ghostscript-fonts/ghostscript-fonts.desc
index 95d4cddef..28936ddb8 100644
--- a/package/x11/ghostscript-fonts/ghostscript-fonts.desc
+++ b/package/x11/ghostscript-fonts/ghostscript-fonts.desc
@@ -32,7 +32,6 @@
 [U] http://www.cups.org/ghostscript.php
 
 [C] extra/printing extra/office
-[E] add ghostscript
 
 [L] OpenSource
 [S] Stable
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 0e7d65a47..39d3ddd20 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -704,7 +704,7 @@ abort() {
 				false
 			fi
 		fi
-		if fl_wrparse -s -r "$xroot/" < $builddir/fl_wrapper.wlog | \
+		if fl_wrparse -D -s -r "$xroot/" < $builddir/fl_wrapper.wlog | \
 			egrep "^(${flistroot// /|})(/|$)" >> \
 			$builddir/flist.txt
 		then : ; fi
@@ -739,13 +739,28 @@ abort() {
 	     "$ROCKCFG_FLIST" = "strace" ] && [ $stagelevel -gt 1 ] ; then
 		echo "Calculating package dependencies ..."
 
-		! egrep -v "^($flistrfilter)\$" $builddir/fl_wrapper.rlog |
-		sort -u | fl_wrparse -s -r "$xroot/" -p '' | \
-		sort -k2 var/adm/flists/* - | grep -v ' var/adm/' | awk '
-			BEGIN { FS=": "; current="."; }
-			$2 == current && $1 != "" && $2 != "'$xpkg'" { print; }
-			$1 == "" { current=$2; }' \
-					>> $builddir/dependencies.debug
+		! egrep -v "^($flistrfilter)\$" $builddir/fl_wrapper.[rw]log |
+		sort -u | fl_wrparse -D -s -r "$xroot/" -p '' | \
+		grep -v ' var/adm/' | awk '
+			ARGIND < ARGC-1 {
+			    if ( $1 != "'$xpkg':" )
+				f[$2] = $1 " " f[$2];
+			}
+			ARGIND == ARGC-1 {
+			    file = $2;
+			    while ( file != "" ) {
+				if ( f[file] ) {
+				    split(f[file], a);
+				    for (i in a)
+					if (! d[a[i] " " file]) {
+					    d[a[i] " " file] = 1;
+					    print a[i] " " file;
+					}
+				}
+				sub("/?[^/]*$", "", file)
+			    }
+			}
+		' var/adm/flists/* - >> $builddir/dependencies.debug
 
 		awk 'BEGIN { FS=": "; } { print "'$xpkg': " $1; }' \
 			<  $builddir/dependencies.debug \