diff --git a/math/cln/Makefile b/math/cln/Makefile
index 2f70f3dbf76f..9c88b013ac46 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -7,12 +7,9 @@
 #
 
 PORTNAME=	cln
-PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTVERSION=	1.1.8
 CATEGORIES=	math devel
-MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/ \
-		ftp://ftp.santafe.edu/pub/gnu/ \
-		ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
+MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gnu/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Class Library for Numbers
@@ -20,12 +17,12 @@ COMMENT=	Class Library for Numbers
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
 USE_BZIP2=	yes
+USE_GCC=	3.3
+USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
-USE_INC_LIBTOOL_VER=13
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
+CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${MANPREFIX}/man \
 		--with-gmp
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
@@ -44,13 +41,6 @@ LDFLAGS=	-L${LOCALBASE}/lib
 BROKEN=		"Does not compile on sparc64"
 .endif
 
-.if ${OSVERSION} < 500035
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-RUN_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
-CPPFLAGS+=	-I${LOCALBASE}/include/stlport ${PTHREAD_CFLAGS}
-LDFLAGS+=	-lstlport_gcc ${PTHREAD_LIBS}
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/dvi
diff --git a/math/cln/distinfo b/math/cln/distinfo
index 41328cb531f7..556cdf993894 100644
--- a/math/cln/distinfo
+++ b/math/cln/distinfo
@@ -1,2 +1,2 @@
-MD5 (cln-1.1.6.tar.bz2) = 8c364297c3cd7cbd413a510b68849451
-SIZE (cln-1.1.6.tar.bz2) = 1595522
+MD5 (cln-1.1.8.tar.bz2) = 490dd0697b3d16b2ba6a843829228cba
+SIZE (cln-1.1.8.tar.bz2) = 1631985
diff --git a/math/cln/files/patch-configure b/math/cln/files/patch-configure
deleted file mode 100644
index 77cca27e61df..000000000000
--- a/math/cln/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue May 28 22:55:47 2002
-+++ configure	Tue Jul 30 06:40:57 2002
-@@ -6933,6 +6933,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'