diff --git a/config/rootfiles/core/46/filelists/files b/config/rootfiles/core/46/filelists/files
index 5f4605e50..4996397c1 100644
--- a/config/rootfiles/core/46/filelists/files
+++ b/config/rootfiles/core/46/filelists/files
@@ -1,2 +1,3 @@
 etc/system-release
 boot/ipfirerd-2.6.32.28.img
+opt/pakfire/lib/functions.pl
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index ba0242367..133b4950f 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -865,7 +865,7 @@ sub checkcryptodb {
 	unless ( "$ret" eq "0" ) {
 		message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
 		message("CRYPTO WARN: It's normal to see this on first execution.");
-		my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fd 2";
+		my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
 		system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
 		system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
 	} else {