diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index d129af07144e..ef3804671de0 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,47 +1,47 @@
 # New ports collection makefile for:    clisp
 # Date created:         Feb  5 2000
 # Whom:                 Jeff Brown <jabrown@caida.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	clisp
 PORTVERSION=	2.35
+PORTREVISION=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=${PORTNAME}/release/${PORTVERSION}
 
 MAINTAINER=	jakub@rehor.net
 COMMENT=	A Common Lisp implementation
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsigsegv.a:${PORTSDIR}/devel/libsigsegv
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 
 # Build subdirectory
 BUILD_DIRNAME=${CONFIGURE_TARGET}
 
 # Check ./configure --list-modules in the distribution to see all modules
 MAKEMAKE_ARGS=--prefix=${PREFIX} --mandir=${PREFIX}/man --with-dynamic-ffi \
-	--with-module=rawsock --with-module=wildcard \
-	--with-module=clx/new-clx --srcdir=${WRKSRC}/src
+	--with-module=rawsock --with-module=wildcard --srcdir=${WRKSRC}/src
 
 .include <bsd.port.pre.mk>
 
 # The source doesn't include a top-level Makefile, so we'll fake one.
 post-extract:
 	@cd ${WRKSRC} && \
 	${PRINTF} "all install:\n\t@cd ${WRKSRC}/${BUILD_DIRNAME} && \$${MAKE} \$${MAKEFLAGS} \$$@\n" > ${WRKSRC}/Makefile
 
 # The 'configure' script stops short of doing this for us.
 post-configure:
 	cd ${WRKSRC}/${BUILD_DIRNAME} && \
 	./makemake ${MAKEMAKE_ARGS} > Makefile && \
 	make config.lisp
 
 MAN1=	clisp.1
 
 .include <bsd.port.post.mk>
diff --git a/lang/clisp/pkg-plist b/lang/clisp/pkg-plist
index 67ef480d659d..efd7bc08f9e8 100644
--- a/lang/clisp/pkg-plist
+++ b/lang/clisp/pkg-plist
@@ -1,87 +1,86 @@
 bin/clisp
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
 lib/clisp/base/libavcall.a
 lib/clisp/base/libcallback.a
 lib/clisp/base/libcharset.a
 lib/clisp/base/libnoreadline.a
 lib/clisp/base/lisp.a
 lib/clisp/base/lisp.run
 lib/clisp/base/lispinit.mem
 lib/clisp/base/makevars
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/base/regex.o
 lib/clisp/base/regexi.o
 lib/clisp/base/regexp.dvi
 lib/clisp/clisp-link
 lib/clisp/data/UnicodeDataFull.txt
 lib/clisp/data/clhs.txt
 lib/clisp/full/calls.o
-lib/clisp/full/clx.o
 lib/clisp/full/gettext.o
 lib/clisp/full/libavcall.a
 lib/clisp/full/libcallback.a
 lib/clisp/full/libcharset.a
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
 lib/clisp/full/lispinit.mem
 lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
 lib/clisp/full/rawsock.o
 lib/clisp/full/regex.o
 lib/clisp/full/regexi.o
 lib/clisp/full/regexp.dvi
 lib/clisp/full/wildcard.dvi
 lib/clisp/full/wildcard.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
 lib/clisp/linkkit/modules.d
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/GNU-GPL
 %%PORTDOCS%%%%DOCSDIR%%/MAGIC.add
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.de
 %%PORTDOCS%%%%DOCSDIR%%/README.es
 %%PORTDOCS%%%%DOCSDIR%%/SUMMARY
 %%PORTDOCS%%%%DOCSDIR%%/clisp.dvi
 %%PORTDOCS%%%%DOCSDIR%%/clisp.html
 %%PORTDOCS%%%%DOCSDIR%%/clisp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/clisp.ps
 %%PORTDOCS%%%%DOCSDIR%%/doc/CLOS-guide.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/LISP-tutorial.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.1
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.dvi
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/doc/clisp.ps
 %%PORTDOCS%%%%DOCSDIR%%/doc/editors.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/impnotes.css
 %%PORTDOCS%%%%DOCSDIR%%/doc/impnotes.html
 share/locale/da/LC_MESSAGES/clisp.mo
 share/locale/da/LC_MESSAGES/clisplow.mo
 share/locale/de/LC_MESSAGES/clisp.mo
 share/locale/de/LC_MESSAGES/clisplow.mo
 share/locale/en/LC_MESSAGES/clisp.mo
 share/locale/en/LC_MESSAGES/clisplow.mo
 share/locale/es/LC_MESSAGES/clisp.mo
 share/locale/es/LC_MESSAGES/clisplow.mo
 share/locale/fr/LC_MESSAGES/clisp.mo
 share/locale/fr/LC_MESSAGES/clisplow.mo
 share/locale/nl/LC_MESSAGES/clisp.mo
 share/locale/nl/LC_MESSAGES/clisplow.mo
 share/locale/ru/LC_MESSAGES/clisp.mo
 share/locale/ru/LC_MESSAGES/clisplow.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/clisp/linkkit
 @dirrm lib/clisp/full
 @dirrm lib/clisp/data
 @dirrm lib/clisp/base
 @dirrm lib/clisp