diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index d1a80a9cd36..01a9c26e1d5 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,16 +1,13 @@
-# $OpenBSD: Makefile,v 1.24 2007/11/18 12:55:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2008/02/04 10:11:27 sthen Exp $
 
 COMMENT=	color X11 terminal emulator with transparency support
 COMMENT-kanji=	color japanese terminal emulator with transparency support
 
 V=		0.9.4
 DISTNAME=	Eterm-$V
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		Eterm-bg-scale-1${EXTRACT_SUFX}:0 \
-		Eterm-bg-scale-2${EXTRACT_SUFX}:0 \
-		Eterm-bg-tile${EXTRACT_SUFX}:0
-PKGNAME=	eterm-$V
-FULLPKGNAME-kanji=	ja-eterm-$V
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+PKGNAME=	eterm-$Vp0
+FULLPKGNAME-kanji=	ja-eterm-$Vp0
 SHARED_LIBS +=	Eterm                1.0      # .0.0
 CATEGORIES=	x11
 
@@ -24,12 +21,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}/download/ \
 		${MASTER_SITE_SOURCEFORGE:=eterm/}
-MASTER_SITES0=	http://freeware.sgi.com/source/Eterm/
 
 WANTLIB=	ICE Imlib2 SM X11 XRes Xau Xdmcp Xext Xmu Xt c freetype \
 		m util z
 
-LIB_DEPENDS=	ast::devel/libast
+LIB_DEPENDS=	ast::devel/libast \
+		ttf::print/freetype
 
 USE_X11=	Yes
 USE_LIBTOOL=	Yes
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index c55bacae992..bc41e41024a 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,20 +1,5 @@
 MD5 (Eterm-0.9.4.tar.gz) = uIae6cm5UWIxr57vpZXO4w==
-MD5 (Eterm-bg-scale-1.tar.gz) = j+B1wRist78FCltha/dk4A==
-MD5 (Eterm-bg-scale-2.tar.gz) = uhs87sUb1Blt8biHyDlkdQ==
-MD5 (Eterm-bg-tile.tar.gz) = JKYPM6NhG0x6boorZdwSDQ==
 RMD160 (Eterm-0.9.4.tar.gz) = zl17p0sZ48iZLRBNAPEDAsPoFQ4=
-RMD160 (Eterm-bg-scale-1.tar.gz) = yv2gtctCgD1LVzuwWV5u+DtUv+I=
-RMD160 (Eterm-bg-scale-2.tar.gz) = JfM/QGL6nMf9jccsElxubcIKCO0=
-RMD160 (Eterm-bg-tile.tar.gz) = Q3YcxSdzCgMF/YV/rRMWuP0E7v4=
 SHA1 (Eterm-0.9.4.tar.gz) = 1jYoCYs6oIyPK8G9dWaD5f0ieZU=
-SHA1 (Eterm-bg-scale-1.tar.gz) = OcYUZ0Dt8E3bCqQO1OB46DF7BVc=
-SHA1 (Eterm-bg-scale-2.tar.gz) = cRNltEeNx8s4kcd6XZBUd4xYEYQ=
-SHA1 (Eterm-bg-tile.tar.gz) = LMsxqP0OgOXdkq6+9rr1VU9m42E=
 SHA256 (Eterm-0.9.4.tar.gz) = Dq66EleBJ2/nMAsyDNfBgPQczUfU3L2yFK2J3T/FQgo=
-SHA256 (Eterm-bg-scale-1.tar.gz) = IY6fChvkbePp12O3W2PGnnHm4HacOWYOejAC9xfe2sE=
-SHA256 (Eterm-bg-scale-2.tar.gz) = WR+/YTb5yjKH0OegIb8RnRtbAQSphbMzY5GR8eI4sXE=
-SHA256 (Eterm-bg-tile.tar.gz) = dxgAgWZPnIDC8kKBhdIzO626/Ajv05s14lMK+8Q95CE=
 SIZE (Eterm-0.9.4.tar.gz) = 814823
-SIZE (Eterm-bg-scale-1.tar.gz) = 3420298
-SIZE (Eterm-bg-scale-2.tar.gz) = 3145775
-SIZE (Eterm-bg-tile.tar.gz) = 1568166
diff --git a/x11/eterm/pkg/PLIST b/x11/eterm/pkg/PLIST
index 65c90b34fec..ce5c749843f 100644
--- a/x11/eterm/pkg/PLIST
+++ b/x11/eterm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2007/11/18 12:55:58 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.9 2008/02/04 10:11:27 sthen Exp $
 @conflict ja-eterm-*
 @conflict eterm-*
 %%SHARED%%
@@ -37,190 +37,11 @@ share/Eterm/pix/menu2.png
 share/Eterm/pix/menu3.png
 share/Eterm/pix/pixmaps.list
 share/Eterm/pix/scale/
-share/Eterm/pix/scale/Bladerunner-bg.png
-share/Eterm/pix/scale/Building.jpg
-share/Eterm/pix/scale/Canyon.jpg
-share/Eterm/pix/scale/Cavefire-bg.png
-share/Eterm/pix/scale/Daughter.jpg
-share/Eterm/pix/scale/Dragon.jpg
-share/Eterm/pix/scale/Evocation.jpg
-share/Eterm/pix/scale/Gas_Station.jpg
-share/Eterm/pix/scale/Hall_of_Mirrors.jpg
 share/Eterm/pix/scale/Neopolis-horizon.jpg
-share/Eterm/pix/scale/Neopolis-horizon.png
-share/Eterm/pix/scale/Piramid.jpg
-share/Eterm/pix/scale/Snow.jpg
-share/Eterm/pix/scale/Terraforming.jpg
-share/Eterm/pix/scale/The_Castle.jpg
-share/Eterm/pix/scale/The_New_Base.jpg
-share/Eterm/pix/scale/after_the_storm.jpg
-share/Eterm/pix/scale/alien_spheres.jpg
-share/Eterm/pix/scale/ascension.png
-share/Eterm/pix/scale/atlantis.jpg
-share/Eterm/pix/scale/back1.jpg
-share/Eterm/pix/scale/back3.jpg
-share/Eterm/pix/scale/beacon2.jpg
-share/Eterm/pix/scale/before_the_storm.jpg
-share/Eterm/pix/scale/bluerising.jpg
-share/Eterm/pix/scale/castle_verde.jpg
-share/Eterm/pix/scale/chamelea.jpg
-share/Eterm/pix/scale/citidel.jpg
-share/Eterm/pix/scale/city3.jpg
-share/Eterm/pix/scale/class_m.jpg
-share/Eterm/pix/scale/conjunction.jpg
-share/Eterm/pix/scale/coup_de_grace.jpg
-share/Eterm/pix/scale/crater_lake.jpg
-share/Eterm/pix/scale/cronus.jpg
-share/Eterm/pix/scale/distant_kin.jpg
-share/Eterm/pix/scale/dvxvb.jpg
-share/Eterm/pix/scale/elysium.jpg
-share/Eterm/pix/scale/enclosure.jpg
-share/Eterm/pix/scale/fossil.jpg
-share/Eterm/pix/scale/fourthday.jpg
-share/Eterm/pix/scale/gaia.jpg
-share/Eterm/pix/scale/gaia_station.jpg
-share/Eterm/pix/scale/galleon.jpg
-share/Eterm/pix/scale/gazebo.jpg
-share/Eterm/pix/scale/good_morning_sunshine.jpg
-share/Eterm/pix/scale/gorgon.jpg
-share/Eterm/pix/scale/holding.jpg
-share/Eterm/pix/scale/hour.jpg
-share/Eterm/pix/scale/hubbles_doorstep.jpg
-share/Eterm/pix/scale/icemoon.jpg
-share/Eterm/pix/scale/inlet.jpg
-share/Eterm/pix/scale/iron_temple.jpg
-share/Eterm/pix/scale/kingdom.jpg
-share/Eterm/pix/scale/lake_of_fire.jpg
-share/Eterm/pix/scale/legacy.jpg
-share/Eterm/pix/scale/lighthouse.jpg
-share/Eterm/pix/scale/lotus.jpg
-share/Eterm/pix/scale/nebula.jpg
-share/Eterm/pix/scale/neopolis.jpg
-share/Eterm/pix/scale/night_of_the_dragon.jpg
-share/Eterm/pix/scale/night_watchman.jpg
-share/Eterm/pix/scale/nocturne.jpg
-share/Eterm/pix/scale/observation_deck.jpg
-share/Eterm/pix/scale/planeta.png
-share/Eterm/pix/scale/pond.png
-share/Eterm/pix/scale/portal.jpg
-share/Eterm/pix/scale/poseidon.png
-share/Eterm/pix/scale/return_to_giza.jpg
-share/Eterm/pix/scale/ripple.png
-share/Eterm/pix/scale/rising.jpg
-share/Eterm/pix/scale/river_of_lead.jpg
-share/Eterm/pix/scale/roche_limit.jpg
-share/Eterm/pix/scale/sentinel.jpg
-share/Eterm/pix/scale/silence.jpg
-share/Eterm/pix/scale/sleepwalker.jpg
-share/Eterm/pix/scale/still_life_study.jpg
-share/Eterm/pix/scale/sun.png
-share/Eterm/pix/scale/the_forest_queen.jpg
-share/Eterm/pix/scale/the_taken_field.jpg
-share/Eterm/pix/scale/traveller.jpg
-share/Eterm/pix/scale/trinity.jpg
-share/Eterm/pix/scale/tunnel.jpg
-share/Eterm/pix/scale/unfriendly_terrain.jpg
-share/Eterm/pix/scale/urmane1.jpg
-share/Eterm/pix/scale/urmane2.jpg
-share/Eterm/pix/scale/urmane3.jpg
-share/Eterm/pix/scale/urmane4.jpg
-share/Eterm/pix/scale/wasteland.jpg
 share/Eterm/pix/thumb_1.png
 share/Eterm/pix/thumb_2.png
 share/Eterm/pix/tile/
-share/Eterm/pix/tile/004.png
-share/Eterm/pix/tile/014.png
-share/Eterm/pix/tile/015.png
-share/Eterm/pix/tile/017.png
-share/Eterm/pix/tile/021.png
-share/Eterm/pix/tile/024.png
-share/Eterm/pix/tile/026.png
-share/Eterm/pix/tile/033.png
-share/Eterm/pix/tile/15.png
-share/Eterm/pix/tile/22.png
-share/Eterm/pix/tile/35.png
-share/Eterm/pix/tile/36.png
-share/Eterm/pix/tile/4.png
-share/Eterm/pix/tile/40.png
-share/Eterm/pix/tile/43.png
-share/Eterm/pix/tile/45.png
-share/Eterm/pix/tile/47.png
-share/Eterm/pix/tile/50.png
-share/Eterm/pix/tile/53.png
-share/Eterm/pix/tile/54.png
-share/Eterm/pix/tile/55.png
-share/Eterm/pix/tile/59.png
-share/Eterm/pix/tile/6.png
-share/Eterm/pix/tile/7.png
-share/Eterm/pix/tile/70s_marble.png
-share/Eterm/pix/tile/7m.png
-share/Eterm/pix/tile/a10.png
-share/Eterm/pix/tile/a2.png
-share/Eterm/pix/tile/a8.png
-share/Eterm/pix/tile/atoms.png
-share/Eterm/pix/tile/atoms2.png
-share/Eterm/pix/tile/backwave.jpg
-share/Eterm/pix/tile/blackstone.png
-share/Eterm/pix/tile/blue_marble.png
-share/Eterm/pix/tile/blue_maze.png
-share/Eterm/pix/tile/blue_rock.png
-share/Eterm/pix/tile/blue_sandpaper.png
-share/Eterm/pix/tile/blue_water.png
-share/Eterm/pix/tile/blue_weave.png
-share/Eterm/pix/tile/blurock.png
-share/Eterm/pix/tile/bow-tiles.png
-share/Eterm/pix/tile/brushed_aluminum.png
-share/Eterm/pix/tile/button1.jpg
-share/Eterm/pix/tile/button5.jpg
-share/Eterm/pix/tile/c0de.jpg
 share/Eterm/pix/tile/circuit.jpg
-share/Eterm/pix/tile/circuit.png
-share/Eterm/pix/tile/coarse_red.png
-share/Eterm/pix/tile/coral3.png
-share/Eterm/pix/tile/coral4.png
-share/Eterm/pix/tile/corrugated_metal.png
-share/Eterm/pix/tile/cyber_bg.png
-share/Eterm/pix/tile/dark_marble.png
-share/Eterm/pix/tile/dirt.png
-share/Eterm/pix/tile/ether.png
-share/Eterm/pix/tile/ether_blue.png
-share/Eterm/pix/tile/ether_green.png
-share/Eterm/pix/tile/firering.png
-share/Eterm/pix/tile/fond_mau.png
-share/Eterm/pix/tile/giger1.png
-share/Eterm/pix/tile/giger2.png
-share/Eterm/pix/tile/green_stucco.png
-share/Eterm/pix/tile/greenred.png
-share/Eterm/pix/tile/greybg.png
-share/Eterm/pix/tile/lava2.png
-share/Eterm/pix/tile/lightb1.png
-share/Eterm/pix/tile/maple1.png
-share/Eterm/pix/tile/money2.png
-share/Eterm/pix/tile/money3.png
-share/Eterm/pix/tile/moss.png
-share/Eterm/pix/tile/multicolor1_dots.png
-share/Eterm/pix/tile/multicolor3_rock.png
-share/Eterm/pix/tile/nebula.jpg
-share/Eterm/pix/tile/pebble1.png
-share/Eterm/pix/tile/plants.png
-share/Eterm/pix/tile/pool_blue.png
-share/Eterm/pix/tile/purpgls.png
-share/Eterm/pix/tile/purple_marble2.png
-share/Eterm/pix/tile/purple_stuff.png
-share/Eterm/pix/tile/qube25p.png
-share/Eterm/pix/tile/red_rock.png
-share/Eterm/pix/tile/red_stucco.png
-share/Eterm/pix/tile/redgray_marble.png
-share/Eterm/pix/tile/shale.png
-share/Eterm/pix/tile/sky2.png
-share/Eterm/pix/tile/soft.png
-share/Eterm/pix/tile/soft_blue.png
-share/Eterm/pix/tile/space.png
-share/Eterm/pix/tile/starry.png
-share/Eterm/pix/tile/strands1.png
-share/Eterm/pix/tile/waves.png
-share/Eterm/pix/tile/woodish1.png
-share/Eterm/pix/tile/wtrstone.jpg
 share/Eterm/themes/
 share/Eterm/themes/Escreen/
 share/Eterm/themes/Escreen/menus.cfg