diff --git a/graphics/fli2gif/Makefile b/graphics/fli2gif/Makefile
index f8400d22665a..c7fdf805d9e9 100644
--- a/graphics/fli2gif/Makefile
+++ b/graphics/fli2gif/Makefile
@@ -7,20 +7,30 @@
 
 PORTNAME=	fli2gif
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.sco.com/skunkware/src/misc/ \
-		ftp://ftp.doc.ic.ac.uk/Mirrors/ftp.sco.com/skunkware/src/misc/ \
-		ftp://ftp.vse.cz/pub/SCO/ftp.sco.com/skunkware/src/misc/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	http://www.bovine.net/~jlawson/coding/fli2gif/
+DISTNAME=	${PORTNAME}b
 
 MAINTAINER=	ports@FreeBSD.org
 
+NO_WRKSUBDIR=	yes
+
+USE_ZIP=	yes
+
+post-extract:
+	@cd ${WRKSRC} && unzip -q -aa source.zip \
+		&& ${LN} -sf GIF.CPP gif.cpp \
+		&& ${LN} -sf FLIPLAY.CPP fliplay.cpp
+
+do-build:
+	@cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} *.cpp
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fli2gif ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/fli2gif
-	${INSTALL_DATA}	${WRKSRC}/*.TXT ${PREFIX}/share/doc/fli2gif
-	${GZIP_CMD} ${PREFIX}/share/doc/fli2gif/*.TXT
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA}	${WRKSRC}/*.TXT ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/fli2gif/distinfo b/graphics/fli2gif/distinfo
index c9add63fcc83..89f95d91854f 100644
--- a/graphics/fli2gif/distinfo
+++ b/graphics/fli2gif/distinfo
@@ -1 +1 @@
-MD5 (fli2gif.tar.gz) = efcd4d184679634f6a9ace79b8402132
+MD5 (fli2gifb.zip) = 8b101992de06634384bd72f29a77408e
diff --git a/graphics/fli2gif/files/patch-aa b/graphics/fli2gif/files/patch-aa
deleted file mode 100644
index 793d041ea315..000000000000
--- a/graphics/fli2gif/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Thu Feb 20 21:28:59 1997
-+++ Makefile	Thu Jan 29 11:27:08 1998
-@@ -1,16 +1,16 @@
- all: fli2gif
- 
- fli2gif: fliplay.o gif.o fli2gif.o
--	CC -o fli2gif fli2gif.o gif.o fliplay.o
-+	$(CC) $(CCFLAGS) -o fli2gif fli2gif.o gif.o fliplay.o
- 
- fliplay.o: fliplay.C
--	CC -c -I. fliplay.C
-+	$(CC) $(CFLAGS) -c -I. fliplay.C
- 
- gif.o: gif.C
--	CC -c -I. gif.C
-+	$(CC) $(CFLAGS) -c -I. gif.C
- 
- fli2gif.o: fli2gif.C
--	CC -c -I. fli2gif.C
-+	$(CC) $(CFLAGS) -c -I. fli2gif.C
- 
- clean:
- 	rm -f fli2gif fli2gif.o fliplay.o gif.o
diff --git a/graphics/fli2gif/files/patch-ab b/graphics/fli2gif/files/patch-ab
index 35c9be11d702..bba80b99a138 100644
--- a/graphics/fli2gif/files/patch-ab
+++ b/graphics/fli2gif/files/patch-ab
@@ -1,5 +1,5 @@
---- fli2gif.C.orig	Tue Jul 29 20:05:27 1997
-+++ fli2gif.C	Thu Jan 29 11:27:08 1998
+--- fli2gif.cpp.orig	Fri Sep  6 00:10:14 1996
++++ fli2gif.cpp	Fri Jul 12 03:00:50 2002
 @@ -43,7 +43,9 @@
  // ******************
  #include <stdio.h>
@@ -11,7 +11,7 @@
  #include <string.h>
  #if defined(__TURBOC__) || defined(_MSC_VER)
      #include <conio.h>
-@@ -112,7 +114,7 @@
+@@ -104,7 +106,7 @@
      // []----------------[]
      // |  Initialization  |
      // []----------------[]
@@ -20,20 +20,12 @@
      printf("   by JL Enterprises, 1996.  (Compiled with "
          #if defined(__TURBOC__)
              "Borland"
-@@ -125,13 +127,15 @@
-         #endif
-         #if defined(_Windows)
+@@ -117,6 +119,8 @@
              " for Windows"
-+	#elif defined(__FreeBSD__)
-+	    " for FreeBSD"
-         #elif defined(_SCO_DS)
-             " for SCO OpenServer 5"
-         #elif defined(__USLC__)
-             " for SCO UnixWare"
          #elif defined(__MSDOS__) || defined(_DOS)
              " for MS-DOS"
--        #endif    
-+        #endif
++        #elif defined(__FreeBSD__)
++            " for FreeBSD"
+         #endif    
          ")\n\n");
      {
-         int gotflic = FALSE, gotgif = FALSE;
diff --git a/graphics/fli2gif/pkg-descr b/graphics/fli2gif/pkg-descr
index 855e4bbc4785..38b5259c48b3 100644
--- a/graphics/fli2gif/pkg-descr
+++ b/graphics/fli2gif/pkg-descr
@@ -11,4 +11,4 @@ utilities to convert from nearly any other animation format into the
 flic format, allowing even more possibilities of animation conversion
 without having to resort to saving out individual frames to separate files.
 
-WWW: http://members.aol.com/JeffLawson/
+WWW: http://www.bovine.net/~jlawson/coding/fli2gif/
diff --git a/graphics/fli2gif/pkg-plist b/graphics/fli2gif/pkg-plist
index 6df71e0f1d8e..c63bf93583c8 100644
--- a/graphics/fli2gif/pkg-plist
+++ b/graphics/fli2gif/pkg-plist
@@ -1,3 +1,3 @@
 bin/fli2gif
-%%PORTDOCS%%share/doc/fli2gif/FLI2GIF.TXT.gz
+%%PORTDOCS%%share/doc/fli2gif/FLI2GIF.TXT
 %%PORTDOCS%%@dirrm share/doc/fli2gif