diff --git a/astro/xearth/Makefile b/astro/xearth/Makefile
index baa2b929742b..d637acbe8495 100644
--- a/astro/xearth/Makefile
+++ b/astro/xearth/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 October 1995
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.4 1995/04/12 20:31:54 asami Exp $
+# $Id: Makefile,v 1.5 1995/10/01 21:53:49 roberto Exp $
 #
 
 DISTNAME=	xearth-1.0
@@ -14,6 +14,8 @@ USE_IMAKE=	yes
 
 # Copy the list of FreeBSD sites
 post-install:
-	cp ${FILESDIR}/freebsd.markers ${PREFIX}/lib/X11
+	mkdir -p ${PREFIX}/lib/X11/xearth
+	cp ${FILESDIR}/freebsd.core.markers ${PREFIX}/lib/X11/xearth
+	cp ${FILESDIR}/freebsd.ftp.markers ${PREFIX}/lib/X11/xearth
 
 .include <bsd.port.mk>
diff --git a/astro/xearth/files/freebsd.core.markers b/astro/xearth/files/freebsd.core.markers
new file mode 100644
index 000000000000..af645d30f3ce
--- /dev/null
+++ b/astro/xearth/files/freebsd.core.markers
@@ -0,0 +1,14 @@
+#
+# FreeBSD core team members
+#
+37.8, -122.4,  "asami, gibbs, jkh"             # San Francisco, CA
+45.5, -122.6,  "davidg"                        # near Portland, OR 
+42.4,  -71.1,  "wollman"                       # Boston, MA
+56.0,   -4.5,  "gary"                          # Glasgow, UK 
+55.8,   37.6,  "ache"                          # Moscow 
+55.4,   11.3,  "phk, sos"                      # Denmark 
+52.0,   13.8,  "joerg"                         # Germany 
+29.7,  -95.4,  "rich"                          # Houston, TX
+39.8,  -86.2,  "dyson"                         # Indianapolis, IN
+-33.55,151.1,  "bde"                           # Sydney, Australia. 
+-31.58,115.49, "peter"                         # Perth, Australia. 
diff --git a/astro/xearth/files/freebsd.ftp.markers b/astro/xearth/files/freebsd.ftp.markers
new file mode 100644
index 000000000000..5566f7a43474
--- /dev/null
+++ b/astro/xearth/files/freebsd.ftp.markers
@@ -0,0 +1,47 @@
+#
+# FreeBSD sites
+#
+37.8, -122.4, "freebsd.org"                   # San Francisco 
+#
+# North America
+#
+35.2,  -80.9, "ftp2.freebsd.org"              # Charlotte, NC 
+29.7,  -95.4, "ftp3.freebsd.org"              # Houston, TX (neosoft.com)
+38.6,  -77.0, "ftp4.freebsd.org"              # Arlington, VA (atinc.com)
+43.6,  -83.9, "ftp5.freebsd.org"              # Mt. Pleasant, MI (C-Mich U)
+#              "ftp6.freebsd.org"              # Blacksburg, VA (Va Tech)
+44.9,  -68.8, "ftp7.freebsd.org"              # Orono, ME (U of Maine)
+#              "ftp.ca.freebsd.org"            # Gatineau, Quebec (synapse.net)
+#
+# South America
+#
+#              "ftp.br.freebsd.org"
+# Europe
+#
+54.0,   -7.0, "ftp.ie.freebsd.org"            # Dublin, Ireland
+#              "ftp.de.freebsd.org"            # Aachen, DE (rwth-aachen)
+#              "ftp.uk.freebsd.org"            # UK (Imperial College)
+60.2,   25.0, "nic.funet.fi"                  # Helsinki?, Finland
+48.9,    2.4, "ftp.ibp.fr"                    # Paris, France
+#              "sunsite.mff.cuni.cz"           # Czech Republic
+#              "ftp.luth.se"                   # Sweden
+#              "ftp.ua.pt"                     # Portugal
+#              "ftp.kiae.su"                   # Russia
+#              "ftp.nl.net"                    # Netherlands
+#
+# Asia/Australia
+#
+35.7,  139.7, "ftp.jp.freebsd.org"            # Tokyo, Japan
+37.0,  127.0, "ftp.kr.freebsd.org"            # Seoul?, South Korea
+-33.55,151.1, "ftp.au.freebsd.org"            # Sydney, Australia.
+#              "ftp2.au.freebsd.org"           # adfa.oz.au
+-27.0, 153.0, "ftp3.au.freebsd.org"           # Brisbane (U of Q'sland)
+14.0,  101.0, "ftp.nectec.or.th"              # Bangkok?
+22.0,  114.0, "ftp.hk.super.net"              # Hong Kong 
+32.1,   34.8, "orgchem.weizmann.ac.il"         # Tel Aviv?, Israel
+#              "nctuccca.edu.tw"               # Taiwan
+#
+# Africa
+#
+-24.8,   28.1, "ftp.internat.freebsd.org"     # Pretoria
+#               "ftp.za.freebsd.org"           # South Africa
diff --git a/astro/xearth/pkg-descr b/astro/xearth/pkg-descr
index 3a2d9d0a84bf..b4d5a306f26c 100644
--- a/astro/xearth/pkg-descr
+++ b/astro/xearth/pkg-descr
@@ -6,6 +6,6 @@ time between updates can be changed with the -wait option.
 Xearth  can  also  render  directly into PPM and GIF files
 instead of drawing in the root window.
 
-There is an additional file called freebsd.markers which
-give the location of several FreeBSD core team members and
-FTP sites.
+There are additional files called freebsd.{core,ftp}.markers
+which give the location of FreeBSD core team members and FTP
+sites.  These are installed in /usr/X11R6/lib/X11/xearth.
diff --git a/astro/xearth/pkg-plist b/astro/xearth/pkg-plist
index b97635f6f9ed..6524670a9a5d 100644
--- a/astro/xearth/pkg-plist
+++ b/astro/xearth/pkg-plist
@@ -1,4 +1,4 @@
-@cwd /usr/X11R6
 bin/xearth
 man/man1/xearth.1.gz
-lib/X11/freebsd.markers
+lib/X11/xearth/freebsd.core.markers
+lib/X11/xearth/freebsd.ftp.markers