diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index adbcbd2473b5..9583a0276a95 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -3,19 +3,22 @@
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/19 00:15:51 mharo Exp $
 #
 
 DISTNAME=	gaim-19990311
 PKGNAME=	gaim-0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
+		http://www.freebsd.org/~mharo/distfiles/ \
 		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} logo.xpm
 
 MAINTAINER=	jim@phrantic.phear.net
 
 LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	gaim
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +26,7 @@ USE_X_PREFIX=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 
 post-patch:
-	${CP} ${FILESDIR}/logo.xpm ${WRKSRC}/pixmaps
+	${CP} ${DISTDIR}/logo.xpm ${WRKSRC}/pixmaps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gaim ${PREFIX}/bin
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 1b4f5f170878..fb7e213fcbd1 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1,2 @@
 MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (logo.xpm) = 25106c75e2d919e7660d7a573554c675
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index adbcbd2473b5..9583a0276a95 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/Makefile
@@ -3,19 +3,22 @@
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/19 00:15:51 mharo Exp $
 #
 
 DISTNAME=	gaim-19990311
 PKGNAME=	gaim-0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
+		http://www.freebsd.org/~mharo/distfiles/ \
 		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} logo.xpm
 
 MAINTAINER=	jim@phrantic.phear.net
 
 LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	gaim
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +26,7 @@ USE_X_PREFIX=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 
 post-patch:
-	${CP} ${FILESDIR}/logo.xpm ${WRKSRC}/pixmaps
+	${CP} ${DISTDIR}/logo.xpm ${WRKSRC}/pixmaps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gaim ${PREFIX}/bin
diff --git a/net/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index 1b4f5f170878..fb7e213fcbd1 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1 +1,2 @@
 MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (logo.xpm) = 25106c75e2d919e7660d7a573554c675
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index adbcbd2473b5..9583a0276a95 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -3,19 +3,22 @@
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/19 00:15:51 mharo Exp $
 #
 
 DISTNAME=	gaim-19990311
 PKGNAME=	gaim-0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.marko.net/pub/gaim/ \
+		http://www.freebsd.org/~mharo/distfiles/ \
 		ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} logo.xpm
 
 MAINTAINER=	jim@phrantic.phear.net
 
 LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	gaim
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +26,7 @@ USE_X_PREFIX=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 
 post-patch:
-	${CP} ${FILESDIR}/logo.xpm ${WRKSRC}/pixmaps
+	${CP} ${DISTDIR}/logo.xpm ${WRKSRC}/pixmaps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gaim ${PREFIX}/bin
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 1b4f5f170878..fb7e213fcbd1 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1,2 @@
 MD5 (gaim-19990311.tar.gz) = b7e8e67123b8a18091296fc06b5908b7
+MD5 (logo.xpm) = 25106c75e2d919e7660d7a573554c675