diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 053548208ac3..b58200ed62e4 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -1,66 +1,66 @@
 # New ports collection makefile for:	CImg
 # Date created:         11 September 2004
 # Whom:			thierry@pompo.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cimg
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	CImg
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	CImg-${PORTVERSION:S/./_/:S/.//}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	The C++ Template Image Processing Library
 
 USE_ZIP=	yes
 BUILD_WRKSRC=	${WRKSRC}/examples
 MAKE_ENV=	CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}"	\
 		LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS}"	\
 		X11PATH=${X11BASE}
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 USE_GCC=	3.4
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 DOCBASE=	CHANGES.txt README.txt
 .else
 NOBUILD=	yes
 .endif
 
 .if !defined(WITHOUT_IM)
 RUN_DEPENDS+=	${LOCALBASE}/lib/libMagick.so.6:${PORTSDIR}/graphics/ImageMagick
 .endif
 .if !defined(WITHOUT_LAPACK)
 LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
 LAPACK_LIB=	-L${LOCALBASE}/lib -lalapack -lcblas -lf77blas -lg2c -latlas
 LAPACK_DEF=	-Dcimg_lapack
 .endif
 
 #post-extract:
 #	@${CP} ${WRKSRC}/CImg.h ${WRKSRC}/CImg.h.dos
 #	@${TR} -d '\r' < ${WRKSRC}/CImg.h.dos > ${WRKSRC}/CImg.h
 
 .if !defined(NOPORTDOCS)
 post-patch:
 	@${GREP} -lR 'img/' ${BUILD_WRKSRC} |	\
 		${XARGS} ${REINPLACE_CMD} -e 's|img/|${EXAMPLESDIR}/img/|g'
 .endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/CImg_test ${PREFIX}/bin
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/documentation/* ${DOCSDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@(cd ${EXAMPLESDIR} && ${MAKE} clean)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index baafee900328..b357e80c7d51 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,2 +1,2 @@
-MD5 (cimg-1.0.7/CImg.zip) = 381f29c8342379d702954a985e9c220c
-SIZE (cimg-1.0.7/CImg.zip) = 4205936
+MD5 (CImg-1_07.zip) = 004eccca2a6a768ea5f8f722ae79a614
+SIZE (CImg-1_07.zip) = 4147049