diff --git a/editors/eshell-emacs20/Makefile b/editors/eshell-emacs20/Makefile
index c7217cbe39bf..5daaffc2cdae 100644
--- a/editors/eshell-emacs20/Makefile
+++ b/editors/eshell-emacs20/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	eshell
 PORTVERSION=	2.4.2
 CATEGORIES=	editors elisp
-MASTER_SITES=	http://www.gci-net.com/users/j/johnw/Emacs/packages/
+MASTER_SITES=	http://emacswiki.org/johnw/Emacs/packages/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}
 
diff --git a/editors/eshell-emacs20/pkg-descr b/editors/eshell-emacs20/pkg-descr
index caff28697a8e..174f78644810 100644
--- a/editors/eshell-emacs20/pkg-descr
+++ b/editors/eshell-emacs20/pkg-descr
@@ -8,4 +8,4 @@ Put the expression below into your ~/.emacs.
 (require 'pcmpl-auto)
 (add-hook 'shell-mode-hook 'pcomplete-shell-setup)
 
-WWW: http://www.gci-net.com/~johnw/eshell.html
+WWW: http://emacswiki.org/johnw/eshell.html