*************** payload: $(PAYLOAD_TARGET)
*** 26,37 ****
        @ cp -af $(SKELETON_DIR)/* $(INITRD_DIR)
        @ chmod 0755 $(INITRD_DIR)/linuxrc
  
-        @ echo "Cleaning unneeded libraries..."
-        @ ( export LDD="$(STAGING_DIR)/bin/ldd"; \
-            for file in `$(BASE_DIR)/bin/checklibs.pl \
-            --verify --silent --script $(INITRD_DIR)`; \
-            do rm $(INITRD_DIR)/lib/$$file; done )
  
        @ echo "Building the initrd..."
        @ install -d $(OUTPUT_DIR)
        @ cd $(INITRD_DIR); find . | cpio -o -H newc 2> /dev/null > $@
--- 26,40 ----
        @ cp -af $(SKELETON_DIR)/* $(INITRD_DIR)
        @ chmod 0755 $(INITRD_DIR)/linuxrc
  
+        @ echo "Cleaning up shared libraries..."
  
+        @ find $(INITRD_DIR) -type f -perm +100 -exec file -rNF '' {} \; | \
+        awk ' /executable.*dynamically/ { print $$1}' > $(INITRD_DIR)/.list
+ 
+        @ (cd $(INITRD_DIR); python $(BIN_DIR)/mklibs.py \
+        --root $(STAGING_DIR) -d ./ `cat $(INITRD_DIR)/.list` > /dev/null)
+ 
+        @ rm -f $(INITRD_DIR)/.list
        @ echo "Building the initrd..."
        @ install -d $(OUTPUT_DIR)
        @ cd $(INITRD_DIR); find . | cpio -o -H newc 2> /dev/null > $@