diff --git a/devel/simpletest/Makefile b/devel/simpletest/Makefile
index c32937b9f0e1..94a0a048e39e 100644
--- a/devel/simpletest/Makefile
+++ b/devel/simpletest/Makefile
@@ -1,19 +1,17 @@
-# Ports collection makefile for:  simpletest
-# Date created:			  16 August 2004
-# Whom:				  Roman Neuhauser (<neuhauser@chello.cz>)
-#
+# Created by: Roman Neuhauser (<neuhauser@chello.cz>)
 # $FreeBSD$
-#
 
 PORTNAME=	simpletest
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/\.0//}
 DISTNAME=	${PORTNAME:L}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danilogondolfo@gmail.com
 COMMENT=	Unit testing, mock objects, and web testing framework for PHP
 
+LICENSE=	LGPL21
+
 USE_PHP=	pcre
 USE_PHP_BUILD=	yes
 DEFAULT_PHP_VER=5
@@ -21,7 +19,11 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:L}
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 DOCFILES=	HELP_MY_TESTS_DONT_WORK_ANYMORE README
 HTMLDOCFILES=	docs/en/*
 .endif
@@ -33,7 +35,7 @@ do-install:
 	cd ${WRKSRC}/ \
 	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
 	  && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${DOCSDIR}/html
 .for file in ${DOCFILES}
@@ -50,7 +52,7 @@ post-install:
 	@${FIND} -s -d ${DATAFILES:S,^,${WRKSRC}/,} -type d \
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${FIND} -s ${DOCSDIR} -not -type d \
 	  | ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
 	@${FIND} -s -d ${DOCSDIR} -type d \
diff --git a/devel/simpletest/distinfo b/devel/simpletest/distinfo
index 30ff8b78e4e1..a91209968689 100644
--- a/devel/simpletest/distinfo
+++ b/devel/simpletest/distinfo
@@ -1,2 +1,2 @@
-SHA256 (simpletest_1.0.1.tar.gz) = 55034d6f180de7d2bbd32bc41ca31c98bc01fc05264cad0e7e8d3619f3d5ffd0
-SIZE (simpletest_1.0.1.tar.gz) = 269696
+SHA256 (simpletest_1.1.0.tar.gz) = c9843becf2cec9022e11a05c8e95ae9e8d23624054c5c4e8e2b68f153e98d665
+SIZE (simpletest_1.1.0.tar.gz) = 287537
diff --git a/devel/simpletest/pkg-descr b/devel/simpletest/pkg-descr
index 53c9fb5fb052..2c9b39d40a93 100644
--- a/devel/simpletest/pkg-descr
+++ b/devel/simpletest/pkg-descr
@@ -3,4 +3,4 @@ around test cases. If you know JUnit or some of the PHPUnit clones this
 will need no explanation. It also adds JWebUnit style testing including
 cookies, authentication and form handling
 
-WWW: http://sourceforge.net/projects/simpletest/
+WWW: http://simpletest.org