diff --git a/src/minimal_overlay/bundles/dropbear/02_build.sh b/src/minimal_overlay/bundles/dropbear/02_build.sh
index 5eb2605d4..2cf0e1c1d 100755
--- a/src/minimal_overlay/bundles/dropbear/02_build.sh
+++ b/src/minimal_overlay/bundles/dropbear/02_build.sh
@@ -28,14 +28,6 @@ make -j $NUM_JOBS
 echo "Installing Dropbear..."
 make -j $NUM_JOBS install DESTDIR="$DESTDIR"
 
-mkdir -p $DESTDIR/lib
-
-# Copy all dependent GLIBC libraries.
-cp $SYSROOT/lib/libnsl.so.1 $DESTDIR/lib
-cp $SYSROOT/lib/libnss_compat.so.2 $DESTDIR/lib
-cp $SYSROOT/lib/libutil.so.1 $DESTDIR/lib
-cp $SYSROOT/lib/libcrypt.so.1 $DESTDIR/lib
-
 mkdir -p $DESTDIR/etc/dropbear
 
 # Create Dropbear SSH configuration BEGIN
diff --git a/src/minimal_overlay/bundles/dropbear/mll_deps b/src/minimal_overlay/bundles/dropbear/mll_deps
index b68c5b8fa..397bf3af9 100644
--- a/src/minimal_overlay/bundles/dropbear/mll_deps
+++ b/src/minimal_overlay/bundles/dropbear/mll_deps
@@ -1 +1,5 @@
 glibc_full
+glibc_libnsl
+glibc_libnss_compat
+glibc_libutil
+glibc_libcrypt
diff --git a/src/minimal_overlay/bundles/glibc_full/bundle.sh b/src/minimal_overlay/bundles/glibc_full/bundle.sh
index 92aed01fa..33735ae1e 100755
--- a/src/minimal_overlay/bundles/glibc_full/bundle.sh
+++ b/src/minimal_overlay/bundles/glibc_full/bundle.sh
@@ -1,42 +1,2 @@
 #!/bin/sh
-
-SRC_DIR=$(pwd)
-
-. ../../common.sh
-
-if [ ! -d $SYSROOT ] ; then
-  echo "Cannot continue - GLIBC is missing. Please buld GLIBC first."
-  exit 1
-fi
-
-echo "Preparing the overlay glibc folder. This may take a while..."
-rm -rf $WORK_DIR/overlay/$BUNDLE_NAME
-mkdir -p $WORK_DIR/overlay/$BUNDLE_NAME/lib
-
-cd $SYSROOT
-
-find . -type l -exec cp {} $WORK_DIR/overlay/$BUNDLE_NAME/lib \;
-echo "All libraries have been copied."
-
-cd $WORK_DIR/overlay/$BUNDLE_NAME/lib
-
-for FILE_DEL in `ls *.so`
-do
-  FILE_KEEP=`ls $FILE_DEL.*`
-
-  if [ ! "$FILE_KEEP" = "" ] ; then
-    # We remove the shorter file and replace it with symbolic link.
-    rm $FILE_DEL
-    ln -s $FILE_KEEP $FILE_DEL
-  fi
-done
-echo "Duplicate libraries have been replaced with soft links."
-
-strip -g *
-echo "All libraries have been optimized for size."
-
-cp -r $WORK_DIR/overlay/$BUNDLE_NAME/lib $WORK_DIR/src/minimal_overlay/rootfs
-
 echo "All GNU C libraries have been installed."
-
-cd $SRC_DIR
diff --git a/src/minimal_overlay/bundles/glibc_full/mll_deps b/src/minimal_overlay/bundles/glibc_full/mll_deps
new file mode 100644
index 000000000..944f208bb
--- /dev/null
+++ b/src/minimal_overlay/bundles/glibc_full/mll_deps
@@ -0,0 +1,18 @@
+glibc_ld-linux
+glibc_libBrokenLocale
+glibc_libanl
+glibc_libc
+glibc_libcidn
+glibc_libcrypt
+glibc_libdl
+glibc_libm
+glibc_libnsl
+glibc_libnss_db
+glibc_libnss_dns
+glibc_libnss_files
+glibc_libnss_hesiod
+glibc_libpthread
+glibc_libresolv
+glibc_librt
+glibc_libthread_db
+glibc_libutil