diff --git a/SPECS/popt.spec b/SPECS/popt.spec
index 8d27ce7..5758978 100644
--- a/SPECS/popt.spec
+++ b/SPECS/popt.spec
@@ -1,4 +1,4 @@
-#TARBALL:	http://rpm5.org/files/popt/popt-1.16.tar.gz
+#TARBALL:	ftp://anduin.linuxfromscratch.org/BLFS/popt/popt-1.16.tar.gz
 #MD5SUM:	3743beefa3dd6247a73f8f7a32c14c33;SOURCES/popt-1.16.tar.gz
 #-----------------------------------------------------------------------------
 Summary:	The popt package contains the popt libraries which are used by some programs parse command-line options.
@@ -6,10 +6,10 @@ Name:		popt
 Version:	1.16
 Release:	1
 License:	GPL
-URL:		http://rpm5.org/files/popt
+URL:		ftp://anduin.linuxfromscratch.org/BLFS/%{name}/
 Group:		BLFS/General_Libraries 
-Vendor:	Elizabeth
-Source0:	http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
+Vendor:		Elizabeth
+Source0:	ftp://anduin.linuxfromscratch.org/BLFS/%{name}/%{name}-%{version}.tar.gz
 Requires:	filesystem
 %description
 The popt package contains the popt libraries which are used by some programs parse command-line options.
diff --git a/setup.sh b/setup.sh
index 3bce78e..5ab369e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 #-----------------------------------------------------------------------------
 #	  Title: setup.sh
-#	   Date: 2019-02-15
-#	Version: 1.1
-#	 Author: baho-utot@columbus.rr.com
+#	   Date: 2020-05-30
+#	Version: 1.2
+#	 Author: chris@cromer.cl
 #	Options:
 #-----------------------------------------------------------------------------
+#	Copyright 2020 Chris Cromer
 #	Copyright 2019 Baho Utot
 #-----------------------------------------------------------------------------
 #	This program is free software: you can redistribute it and/or modify
@@ -121,9 +122,9 @@ function _chapter_3 {
 	while IFS= read -r i; do
 		list+="${i} "
 	done < "${TOPDIR}/BOOK/wget-list"
-	list+="http://rpm5.org/files/popt/popt-1.16.tar.gz "
+	list+="ftp://anduin.linuxfromscratch.org/BLFS/popt/popt-1.16.tar.gz "
 	list+="http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.1.tar.bz2 "
-	list+="http://download.oracle.com/berkeley-db/db-6.0.20.tar.gz "
+	list+="https://ftp.osuosl.org/pub/blfs/conglomeration/db/db-6.0.20.tar.gz "
 	list+="https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.bz2 "
 	list+="https://ftp.gnu.org/gnu/wget/wget-1.20.1.tar.gz "
 	for i in ${list}; do