diff --git a/devel/flick/Makefile b/devel/flick/Makefile
index d4e0cedadd13..db2b2e4d541c 100644
--- a/devel/flick/Makefile
+++ b/devel/flick/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	flick
-# Version required:	1.1
+# Version required:	2.0
 # Date created:		21 Mar 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	flick-src-1.1
-PKGNAME=	flick-1.1
+DISTNAME=	flick-2.0-src
+PKGNAME=	flick-2.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://flux.cs.utah.edu/flux/flick/1.1/
+MASTER_SITES=	ftp://flux.cs.utah.edu/flux/flick/2.0/
 
 MAINTAINER=     ports@FreeBSD.org
 
@@ -21,8 +21,8 @@ WRKSRC=	${WRKDIR}/${PKGNAME}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/flick
-	${INSTALL_DATA}	${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/flick
+	@${MKDIR} ${PREFIX}/share/doc/flick
+	${INSTALL_DATA}	${WRKSRC}/doc/guts/*.ps ${PREFIX}/share/doc/flick
 	${INSTALL_DATA}	${WRKSRC}/doc/usersguide/*.ps ${PREFIX}/share/doc/flick
 .endif
 
diff --git a/devel/flick/distinfo b/devel/flick/distinfo
index e84bc07da08a..6aaf940c61b4 100644
--- a/devel/flick/distinfo
+++ b/devel/flick/distinfo
@@ -1 +1 @@
-MD5 (flick-src-1.1.tar.gz) = 48362e02fdca8de2e90c2d5815d38365
+MD5 (flick-2.0-src.tar.gz) = cfc2b9b9ccdc08cfe0cde29c1b603169
diff --git a/devel/flick/pkg-descr b/devel/flick/pkg-descr
index 5702ed9c265c..5dcd2e704c4f 100644
--- a/devel/flick/pkg-descr
+++ b/devel/flick/pkg-descr
@@ -25,7 +25,7 @@ conference, in June (see http://www.cs.bu.edu/pub/pldi97/).  The paper is
 included as part of the Flick distribution, and is separately available at
 ftp://mancos.cs.utah.edu/papers/flick-pldi-97-abs.html.
 
-    URL: http://www.cs.utah.edu/projects/flux/flick/
-
 Jay Lepreau, lepreau@cs.utah.edu
 University of Utah Computer Science Dept.
+
+WWW: http://www.cs.utah.edu/projects/flux/flick/
diff --git a/devel/flick/pkg-plist b/devel/flick/pkg-plist
index b862a9020beb..3f69826881db 100644
--- a/devel/flick/pkg-plist
+++ b/devel/flick/pkg-plist
@@ -2,10 +2,13 @@ bin/flick-aoid
 bin/flick-c-fe-mig
 bin/flick-c-pbe-fluke
 bin/flick-c-pbe-iiop
+bin/flick-c-pbe-iiopxx
+bin/flick-c-pbe-khazana
 bin/flick-c-pbe-mach3mig
 bin/flick-c-pbe-sun
 bin/flick-c-pbe-trapeze
 bin/flick-c-pfe-corba
+bin/flick-c-pfe-corbaxx
 bin/flick-c-pfe-fluke
 bin/flick-c-pfe-sun
 bin/flick-c-presd
@@ -18,25 +21,31 @@ include/flick/encode/mach3mig.h
 include/flick/encode/xdr.h
 include/flick/link/ORB.h
 include/flick/link/all.h
+include/flick/link/alloca.h
 include/flick/link/iiop.h
+include/flick/link/iiopxx.h
+include/flick/link/khazana.h
 include/flick/link/mach3mig.h
 include/flick/link/suntcp.h
 include/flick/link/trapeze.h
 include/flick/pres/all.h
 include/flick/pres/corba.h
+include/flick/pres/corbaxx.h
 include/flick/pres/mig.h
 include/flick/pres/mom.h
+include/flick/pres/std_defines.scml
 include/flick/pres/sun.h
-lib/libflick-aoi.a
-lib/libflick-c-pbe.a
-lib/libflick-c-pfe-corba.a
-lib/libflick-c-pfe.a
-lib/libflick-cast.a
-lib/libflick-compiler.a
-lib/libflick-mint.a
-lib/libflick-pres_c.a
-share/doc/flick/flick-pldi97.ps
-share/doc/flick/headers.ps
+include/flick/pres/tao_array.scml
+include/flick/pres/tao_base.scml
+include/flick/pres/tao_cxx.scml
+include/flick/pres/tao_exception.scml
+include/flick/pres/tao_interface.scml
+include/flick/pres/tao_sequence.scml
+include/flick/pres/tao_struct.scml
+include/flick/pres/tao_union.scml
+lib/libflick-iiop.a
+lib/libflick-suntcp.a
+share/doc/flick/guts.ps
 share/doc/flick/user.ps
 @dirrm include/flick/encode
 @dirrm include/flick/link