diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index a55b408112bc..538c5a45f520 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	chicken
-PORTVERSION=	1.89
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.call-with-current-continuation.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alejandro@varnet.biz
 COMMENT=	A Scheme-to-C compiler
 
+USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=	15
-USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		chicken-config.1 chicken-profile.1 chicken-setup.1 chicken.1 \
@@ -24,7 +23,7 @@ MAN1=		chicken-config.1 chicken-profile.1 chicken-setup.1 chicken.1 \
 INFO=		chicken
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	FAQ.html format.txt README LICENSE chicken.html chicken.pdf
+PORTDOCS=	README chicken.html format.txt
 .endif
 
 OPTIONS=	PCRE "With PCRE support" off
@@ -43,20 +42,15 @@ CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's/\(install-data-am: \)install-data-local/\1/' \
+	@${REINPLACE_CMD} -e 's/\(install-data-am: \)install-data-local/\1/' \
 		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's|"/usr/local/include" ||' ${WRKSRC}/csc.scm.in
+	@${REINPLACE_CMD} -e 's|"/usr/local/include" ||' ${WRKSRC}/csc.scm.in
 
 post-install:
-	${MKDIR} ${PREFIX}/lib/chicken
+	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
 
-test:
-	cd ${WRKSRC}; ${MAKE} test
-
 .include <bsd.port.post.mk>
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index 3129102e1a3d..2c917cdb7941 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,2 +1,2 @@
-MD5 (chicken-1.89.tar.gz) = 6347f27f372951312ad5d0a0ab7a3e7a
-SIZE (chicken-1.89.tar.gz) = 3881868
+MD5 (chicken-2.0.tar.gz) = 6eb806a4e9cc9226874b0c4f20abf21e
+SIZE (chicken-2.0.tar.gz) = 3526028
diff --git a/lang/chicken/files/patch-Makefile.in b/lang/chicken/files/patch-Makefile.in
deleted file mode 100644
index f7e7194e11a7..000000000000
--- a/lang/chicken/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat May 28 11:37:56 2005
-+++ Makefile.in	Sat May 28 11:39:10 2005
-@@ -199,7 +199,7 @@
- # use -DC_NO_PIC_NO_DLL ... -DC_NO_PIC_NO_DLL is only for libtool
- # compiles
- BASE_CPPFLAGS = -DC_STACK_GROWS_DOWNWARD=$(STACK_GROWS_DOWNWARD) -DC_INSTALL_LIB_HOME='"$(pkglibdir)"' \
--  -DC_INSTALL_HOME='"$(pkgdatadir)"' -DC_USE_C_DEFAULTS
-+  -DC_INSTALL_HOME='"$(pkgdatadir)"' -DC_USE_C_DEFAULTS -I$(includedir)
- 
- INCLUDES = $(BASE_CPPFLAGS) -DC_NO_PIC_NO_DLL
- 
diff --git a/lang/chicken/pkg-plist b/lang/chicken/pkg-plist
index 8a3a6e03fbbe..ffca08217f81 100644
--- a/lang/chicken/pkg-plist
+++ b/lang/chicken/pkg-plist
@@ -12,53 +12,15 @@ include/chicken.h
 lib/libchicken.a
 lib/libchicken.so
 lib/libchicken.so.0
-lib/libsrfi-chicken.a
-lib/libsrfi-chicken.so
-lib/libsrfi-chicken.so.0
-lib/libstuffed-chicken.a
-lib/libstuffed-chicken.so
-lib/libstuffed-chicken.so.0
 lib/libuchicken.a
 lib/libuchicken.so
 lib/libuchicken.so.0
-lib/libusrfi-chicken.a
-lib/libusrfi-chicken.so
-lib/libusrfi-chicken.so.0
-lib/libustuffed-chicken.a
-lib/libustuffed-chicken.so
-lib/libustuffed-chicken.so.0
 %%DATADIR%%/banner.scm
 %%DATADIR%%/chicken-default-entry-points.scm
 %%DATADIR%%/chicken-entry-points.scm
 %%DATADIR%%/chicken-ffi-macros.scm
-%%DATADIR%%/chicken-highlevel-macros.scm
 %%DATADIR%%/chicken-match-macros.scm
 %%DATADIR%%/chicken-more-macros.scm
-%%DATADIR%%/test-infrastructure-hygienic-local.scm
-%%DATADIR%%/test-infrastructure-hygienic.scm
-%%DATADIR%%/test-infrastructure-lowlevel-local.scm
-%%DATADIR%%/test-infrastructure-lowlevel.scm
-%%DATADIR%%/test-infrastructure.scm
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/calendar.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/cube.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/ctclsh.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/eval-client.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/eval-server.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/hellowin.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/makefile.vc
-%%PORTDOCS%%%%EXAMPLESDIR%%/mandelbrot.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/nqueens.prolog
-%%PORTDOCS%%%%EXAMPLESDIR%%/prolog.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/schelog-macros.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/schelog-support.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/tclAppInit.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcp-client.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/tcp-server.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/x11cplot.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/x11cplot.h
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @exec mkdir -p %D/lib/chicken
 @dirrm lib/chicken