diff --git a/net-im/ymessenger/Makefile b/net-im/ymessenger/Makefile
index 0ba0b8aca495..2f2d65c68a8d 100644
--- a/net-im/ymessenger/Makefile
+++ b/net-im/ymessenger/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	ymessenger
-PORTVERSION=	0.99.19.1
+PORTVERSION=	1.0.4
 PORTEPOCH=	20020902
 CATEGORIES=	net
-MASTER_SITES=	http://download.yahoo.com/dl/unix/fbsd45/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.+)\.(.+)$/.\1-\2/g}
+MASTER_SITES=	http://download.yahoo.com/dl/unix/
+DISTNAME=	fbsd4.${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sethk@meowfishies.com
@@ -43,14 +43,10 @@ do-install:
 		    ${PREFIX}/libexec/ymessenger; \
 	    done)
 	${MKDIR} ${PREFIX}/lib/ymessenger
-	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.21 \
+	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.0 \
 		${PREFIX}/lib/ymessenger/
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKDIR}/bin/ymessenger
-	${ECHO} 4 | dd bs=1 count=1 conv=notrunc seek=35437 \
-		of=${WRKDIR}/bin/ymessenger.bin
-	${ECHO} 4 | dd bs=1 count=1 conv=notrunc seek=62665 \
-		of=${WRKDIR}/lib/libgtkhtml.so.21
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ymessenger/distinfo b/net-im/ymessenger/distinfo
index 4da6a3f8bfb2..4ba080020c8f 100644
--- a/net-im/ymessenger/distinfo
+++ b/net-im/ymessenger/distinfo
@@ -1 +1 @@
-MD5 (ymessenger-0.99.19-1.tgz) = 801999637d6a76ef88717d3a424c91ae
+MD5 (fbsd4.ymessenger.tgz) = 112b96f083e77ecbd9398831e38a0c25
diff --git a/net/ymessenger/Makefile b/net/ymessenger/Makefile
index 0ba0b8aca495..2f2d65c68a8d 100644
--- a/net/ymessenger/Makefile
+++ b/net/ymessenger/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	ymessenger
-PORTVERSION=	0.99.19.1
+PORTVERSION=	1.0.4
 PORTEPOCH=	20020902
 CATEGORIES=	net
-MASTER_SITES=	http://download.yahoo.com/dl/unix/fbsd45/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.+)\.(.+)$/.\1-\2/g}
+MASTER_SITES=	http://download.yahoo.com/dl/unix/
+DISTNAME=	fbsd4.${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sethk@meowfishies.com
@@ -43,14 +43,10 @@ do-install:
 		    ${PREFIX}/libexec/ymessenger; \
 	    done)
 	${MKDIR} ${PREFIX}/lib/ymessenger
-	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.21 \
+	${INSTALL_DATA} ${WRKDIR}/lib/libgtkhtml.so.0 \
 		${PREFIX}/lib/ymessenger/
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKDIR}/bin/ymessenger
-	${ECHO} 4 | dd bs=1 count=1 conv=notrunc seek=35437 \
-		of=${WRKDIR}/bin/ymessenger.bin
-	${ECHO} 4 | dd bs=1 count=1 conv=notrunc seek=62665 \
-		of=${WRKDIR}/lib/libgtkhtml.so.21
 
 .include <bsd.port.post.mk>
diff --git a/net/ymessenger/distinfo b/net/ymessenger/distinfo
index 4da6a3f8bfb2..4ba080020c8f 100644
--- a/net/ymessenger/distinfo
+++ b/net/ymessenger/distinfo
@@ -1 +1 @@
-MD5 (ymessenger-0.99.19-1.tgz) = 801999637d6a76ef88717d3a424c91ae
+MD5 (fbsd4.ymessenger.tgz) = 112b96f083e77ecbd9398831e38a0c25