diff --git a/guix/download.scm b/guix/download.scm
index 29a8f99034..2e9ecb43fc 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -97,7 +97,7 @@
"http://hackage.haskell.org/")
(savannah ; http://download0.savannah.gnu.org/mirmon/savannah/
"https://download.savannah.gnu.org/releases/"
- "https://nongnu.freemirror.org/nongnu/"
+ "https://de.freedif.org/savannah/"
"https://ftp.cc.uoc.gr/mirrors/nongnu.org/"
"http://ftp.twaren.net/Unix/NonGNU/" ; https appears unsupported
"https://mirror.csclub.uwaterloo.ca/nongnu/"
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 3ba4b86a4f..1142c53d3d 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -687,9 +687,9 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
(define %savannah-base
;; One of the Savannah mirrors listed at
- ;; that serves valid
+ ;; that serves valid
;; HTML (unlike .)
- "https://nongnu.freemirror.org/nongnu")
+ "https://de.freedif.org/savannah/")
(define (latest-savannah-release package)
"Return the latest release of PACKAGE."