diff --git a/print/lout/Makefile b/print/lout/Makefile
index 0e0eac6c01d7..fe6baf2dc445 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -8,23 +8,28 @@
 PORTNAME=	lout
 PORTVERSION=	3.39
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
-		ftp://ftp.it.usyd.edu.au/jeff/lout/
-MASTER_SITE_SUBDIR=	support/lout
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LaTeX like document creation system with PostScript/PDF output
 
+LICENSE=	GPLv3 # (or later)
+
+OPTIONS_DEFINE=	DOCS
+
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	lout prg2lout
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		lout.1 prg2lout.1
 
-.if defined(NOPORTDOCS)
-INSTALL_TARGET=	install installman
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install installman installdoc
+.else
+INSTALL_TARGET=	install installman
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/lout/pkg-descr b/print/lout/pkg-descr
index b10e9ff31482..7f9c6509b8c9 100644
--- a/print/lout/pkg-descr
+++ b/print/lout/pkg-descr
@@ -9,4 +9,4 @@ European languages are supported, including Russian), formatting of
 computer programs, and more. Lout may be extended by writing definitions
 which are much simpler than the equivalent troff of TeX macros.
 
-WWW: http://snark.ptc.spbu.ru/~uwe/lout/
+WWW: http://savannah.nongnu.org/projects/lout/