-# Additional packages (not in original LFS, only for hvlinux).
-fpkg ${NANO} http://www.nano-editor.org/dist/v2.0
-fpkg_hv ${REISERFSPROGS}
-fpkg ${PAM} http://www.kernel.org/pub/linux/libs/pam/pre/library
-fpkg ${OPENSSL} ftp://ftp.openssl.org/source
-fpkg ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-fpkg ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
-fpkg ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
-fpkg_gnu ${WHICH}
-fpkg ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
-fpkg ${APR} http://apache.sunsite.ualberta.ca/apr
-fpkg_sf ${EXPAT}
-fpkg ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
-fpkg ${NEON} http://www.webdav.org/neon
-fpkg ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg ${SUDO} http://www.courtesan.com/sudo/dist
-fpkg ${PKG_CONFIG} http://pkgconfig.freedesktop.org/releases
-fpkg ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
-fpkg_hv ${POPT}
-fpkg_hv ${PORTMAP}
-fpkg_gnu ${EMACS}
-
-fpkg_gnu ${WGET}
-fpkg ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
+# These packages are only for stage2
+fpkg -e "tar.gz" ${PERL} "http://www.cpan.org/src/5.0"
+fpkg -s "linux/docs/manpages" ${MANPAGES} ${KERNEL_URL}
+fpkg -m fd ${PKG_CONFIG}
+fpkg ${IANA} "http://www.sethwklein.net"
+fpkg -e "tar.gz" ${PROCPS} "http://procps.sourceforge.net"
+fpkg -m gnu ${READLINE}
+fpkg -m gnu ${LIBTOOL}
+fpkg -m gnu ${GDBM}
+fpkg -m gnu ${INETUTILS}
+fpkg -m gnu ${AUTOCONF}
+fpkg -m gnu ${AUTOMAKE}
+fpkg -m gnu ${GROFF}
+fpkg ${IPROUTE2} \
+ "http://devresources.linux-foundation.org/dev/iproute2/download"
+fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
+ "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
+fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"