71 files changed, 71 insertions, 71 deletions

diff --git a/arabic/arabtex/Makefile b/arabic/arabtex/Makefile
index 8e7e0e4d3b82..b7b2696ea24d 100644
--- a/arabic/arabtex/Makefile
+++ b/arabic/arabtex/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/
 DISTNAME=	arab${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A TeX/LaTeX package to generate the arabic writing
 
 BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX \
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 02578dfb686f..59c736c1ef64 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A software speech synthesizer
 
 LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio
diff --git a/audio/ufmcontrol-i18n/Makefile b/audio/ufmcontrol-i18n/Makefile
index 7bc3349f4e01..375f085a748d 100644
--- a/audio/ufmcontrol-i18n/Makefile
+++ b/audio/ufmcontrol-i18n/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:C/-i18n$//1}
 
-MAINTAINER=		nivit@users.sourceforge.net
+MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		USB radio control utility
 
 INSTALLS_SHLIB=		yes
diff --git a/audio/ufmcontrol-i18n/pkg-descr b/audio/ufmcontrol-i18n/pkg-descr
index dd81240327e5..f51847eff9c9 100644
--- a/audio/ufmcontrol-i18n/pkg-descr
+++ b/audio/ufmcontrol-i18n/pkg-descr
@@ -6,4 +6,4 @@ WWW: http://ufmcontrol.sourceforge.net/
 
 --
 Nicola Vitale
-nivit@users.sourceforge.net
+nivit@FreeBSD.org
diff --git a/devel/obfuscatejs/Makefile b/devel/obfuscatejs/Makefile
index f06dfb8ac91a..205a4721887d 100644
--- a/devel/obfuscatejs/Makefile
+++ b/devel/obfuscatejs/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.jar
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A JavaScript code obfuscator
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
diff --git a/devel/py-celementtree/Makefile b/devel/py-celementtree/Makefile
index 1bb808d94b5b..02adb1db73b5 100644
--- a/devel/py-celementtree/Makefile
+++ b/devel/py-celementtree/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://effbot.org/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-20051216
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A fast C implementation of the ElementTree API
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 10eabf904261..630039676ede 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A python implementation of a JSON (http//:json.org) reader/writer
 
 NO_WRKSUBDIR=	yes
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 2cfc11c309bd..2753dd3b786a 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyProtocols-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module extending the PEP 246 adapt() function
 
 USE_PYTHON=	yes
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 2cfc11c309bd..2753dd3b786a 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyProtocols-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module extending the PEP 246 adapt() function
 
 USE_PYTHON=	yes
diff --git a/devel/py-testgears/Makefile b/devel/py-testgears/Makefile
index 7bfe9a193f4c..d645fb149623 100644
--- a/devel/py-testgears/Makefile
+++ b/devel/py-testgears/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module to run tests written as simple functions
 
 BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile
index 197482d4270f..f147ce2b428f 100644
--- a/editors/drjava/Makefile
+++ b/editors/drjava/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-stable-${PORTVERSION:S|.|-|g}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A lightweight IDE for writing Java programs
 
 NO_BUILD=	yes
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index f17fafce76ff..6912f69d4497 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	editors textproc
 MASTER_SITES=	http://www2.autistici.org/bakunin/morla/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A RDF editor
 
 LIB_DEPENDS=	nxml.0:${PORTSDIR}/textproc/libnxml \
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index 04bd7b0fc4a7..5c28bb8b3a48 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	python
 DISTNAME=	${PORTNAME}-${PORTVERSION}-wx2.6.1.0
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Stani's Python Editor
 
 USE_PYTHON=	yes
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 8fa25287e357..f8ae3bcbf978 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://download.berlios.de/winefish/ \
 		http://nivi.interfree.it/distfiles/winefish/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A LaTeX editor based on BlueFish
 
 LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell \
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index 0bee8245b022..6b8b1e5eb219 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	glx
 DISTNAME=	GLE-${PORTVERSION}-src
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A graphics language that produces images from script files
 
 RUN_DEPENDS=	gv:${PORTSDIR}/print/gv
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index 16e60f31bb08..b25bf0927faa 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pixel oriented graphics editor
 
 NO_BUILD=	yes
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index 0815981120e7..351cfb46a24a 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-latest
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Create PNG images from LaTeX math expressions
 
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
diff --git a/graphics/linux-f10-sdl_image/Makefile b/graphics/linux-f10-sdl_image/Makefile
index 5efe067f5163..b5c24c39df72 100644
--- a/graphics/linux-f10-sdl_image/Makefile
+++ b/graphics/linux-f10-sdl_image/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}-1
 
-MAINTAINER=	nivit@users.sourceforge.net
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/graphics/linux-f8-sdl_image/Makefile b/graphics/linux-f8-sdl_image/Makefile
index 5efe067f5163..b5c24c39df72 100644
--- a/graphics/linux-f8-sdl_image/Makefile
+++ b/graphics/linux-f8-sdl_image/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}-1
 
-MAINTAINER=	nivit@users.sourceforge.net
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile
index 5efe067f5163..b5c24c39df72 100644
--- a/graphics/linux-sdl_image/Makefile
+++ b/graphics/linux-sdl_image/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics linux
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 DISTNAME=	SDL_image-${PORTVERSION}-1
 
-MAINTAINER=	nivit@users.sourceforge.net
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple library to load images as SDL interfaces (linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index a5bdd8df8c06..9062e025f17f 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics print java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A software for creating plots of points, lines, etc
 
 NO_BUILD=	yes
diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile
index efd749ac4820..8584209ea314 100644
--- a/graphics/py-visual/Makefile
+++ b/graphics/py-visual/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.vpython.org/download/ \
 MASTER_SITE_SUBDIR=	visualpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A python module that offers real 3D visual output
 
 BUILD_DEPENDS=	${PYNUMERIC} \
diff --git a/graphics/uDrawGraph/Makefile b/graphics/uDrawGraph/Makefile
index 51b12e794189..df13ba70985c 100644
--- a/graphics/uDrawGraph/Makefile
+++ b/graphics/uDrawGraph/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	graphics math
 MASTER_SITES=	http://www.informatik.uni-bremen.de/uDrawGraph/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${PKGNUM}-${OPSYS:L}-${ARCH}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A graph drawing/visualization system
 
 NO_BUILD=	yes
diff --git a/japanese/ja6/Makefile b/japanese/ja6/Makefile
index edec07574580..d356e5134588 100644
--- a/japanese/ja6/Makefile
+++ b/japanese/ja6/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://members.tripod.com/~so_o2/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
 DISTVERSIONSUFFIX=	-bin
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Japanese Symbols Trainer
 
 NO_BUILD=	yes
diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile
index 6eee100dba83..8bf119d6644f 100644
--- a/japanese/kana-no-quiz/Makefile
+++ b/japanese/kana-no-quiz/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	Kana_no_quiz-${DISTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A little tool to memorize Japanese KANA (Hiragana/Katakana)
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/japanese/slimeforest/Makefile b/japanese/slimeforest/Makefile
index 82c5f0e5f67b..ce310a367d31 100644
--- a/japanese/slimeforest/Makefile
+++ b/japanese/slimeforest/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	sfa
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@users.sourceforge.net
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A NES RPG game for learning KANA and KANJI (linux version)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0:${PORTSDIR}/graphics/linux-sdl_image
diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile
index cbcf1642bb48..b8a1c2ed7ed8 100644
--- a/java/eclipse-drjava/Makefile
+++ b/java/eclipse-drjava/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	drjava
 PKGNAMEPREFIX=	eclipse-
 DISTNAME=	drjava-eclipse-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	DrJava plugin for Eclipse
 
 RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile
index dce7f01c88d6..ee674367ce18 100644
--- a/math/asymptote/Makefile
+++ b/math/asymptote/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A powerful script-based vector graphics language
 
 LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3
diff --git a/math/chryzodus/Makefile b/math/chryzodus/Makefile
index bc99301a6268..011d3ae12aa8 100644
--- a/math/chryzodus/Makefile
+++ b/math/chryzodus/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A chryzode (http//www.chryzode.org) explorer
 
 LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro
diff --git a/math/geogebra-i18n/Makefile b/math/geogebra-i18n/Makefile
index e20dc30b8ad3..03904534a924 100644
--- a/math/geogebra-i18n/Makefile
+++ b/math/geogebra-i18n/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	geogebra_setup
 EXTRACT_SUFX=	.jar
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A dynamic software that joins geometry, algebra and calculus
 
 USE_JAVA=	yes
diff --git a/math/javaview/Makefile b/math/javaview/Makefile
index 811b912c0a92..62792f2986e8 100644
--- a/math/javaview/Makefile
+++ b/math/javaview/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.javaview.de/download/data/
 DISTFILES=	javaview.zip jv_models.zip jv_tutor.zip
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A 3D viewer and a mathematical visualization software
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
diff --git a/math/jsmath-fonts-sprite/Makefile b/math/jsmath-fonts-sprite/Makefile
index c07eb92b26d5..8ae5f31d43c7 100644
--- a/math/jsmath-fonts-sprite/Makefile
+++ b/math/jsmath-fonts-sprite/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math www
 MASTER_SITES=	http://www.math.union.edu/~dpvc/jsMath/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A sprite fonts pack for jsMath
 
 USE_ZIP=	yes
diff --git a/math/jsmath-fonts/Makefile b/math/jsmath-fonts/Makefile
index cbfcc2755f6c..3b500def1568 100644
--- a/math/jsmath-fonts/Makefile
+++ b/math/jsmath-fonts/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math www
 MASTER_SITES=	http://www.math.union.edu/~dpvc/jsMath/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A raster fonts pack for jsmath
 
 USE_ZIP=	yes
diff --git a/math/jsmath/Makefile b/math/jsmath/Makefile
index 255093ce5702..77bdeb3d033a 100644
--- a/math/jsmath/Makefile
+++ b/math/jsmath/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math www
 MASTER_SITES=	http://www.math.union.edu/~dpvc/jsMath/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Javascript tool for including mathematics in web pages
 
 USE_ZIP=	yes
diff --git a/math/kash3/Makefile b/math/kash3/Makefile
index 9acdfba99fef..378a7c0b2a0d 100644
--- a/math/kash3/Makefile
+++ b/math/kash3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.math.tu-berlin.de/pub/algebra/Kant/Kash_3/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 DISTNAME=	${PORTNAME:U}-${ELFTYPE}-${PORTVERSION:S|.|-|g}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A computer algebra system for computing in algebraic number fields
 
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index c4f4d7c14a71..7f45dc24b8a3 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Mathematical expressions parser library written in C++
 
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/math/plman/Makefile b/math/plman/Makefile
index b1118a390737..bbc2dce879a9 100644
--- a/math/plman/Makefile
+++ b/math/plman/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://${PORTNAME}.sourceforge.net/dist/ \
 DISTNAME=	${PORTNAME}${PORTVERSION:C/\./_/g}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Propositional Logic sentence shell/interpreter
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
diff --git a/math/truthtable/Makefile b/math/truthtable/Makefile
index be37239defd7..682912135571 100644
--- a/math/truthtable/Makefile
+++ b/math/truthtable/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	TruthTable
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Truth Tables generator (written in Java)
 
 USE_JAVA=	yes
diff --git a/math/ump/Makefile b/math/ump/Makefile
index 073b1ae52460..c0a9046c4aab 100644
--- a/math/ump/Makefile
+++ b/math/ump/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	u-m-p
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A graphical, easy to use math program
 
 CONFLICTS=	ump-1.[0-9]*
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 81676c9874f3..3a5e22a3be5b 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:L}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A wxWidgets GUI for the computer algebra system maxima
 
 RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
diff --git a/multimedia/castpodder/Makefile b/multimedia/castpodder/Makefile
index d4697a588242..4114b340f65e 100644
--- a/multimedia/castpodder/Makefile
+++ b/multimedia/castpodder/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/
 DISTNAME=	CastPodder-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A podcast receiver written in Python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmms/__init__.py:${PORTSDIR}/audio/py-xmms \
diff --git a/multimedia/katchtv/Makefile b/multimedia/katchtv/Makefile
index aed2ce5db39f..4e2f278b6718 100644
--- a/multimedia/katchtv/Makefile
+++ b/multimedia/katchtv/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.digitalunleashed.com/downloads/${PORTNAME}/ \
 DISTNAME=	${PORTNAME}_latest_release
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	An Internet TV application (for KDE)
 
 RUN_DEPENDS=	kdepyuic:${PORTSDIR}/x11-toolkits/py-kde \
diff --git a/multimedia/py-pybmp/Makefile b/multimedia/py-pybmp/Makefile
index 05fc8caeaf2a..a4b37efce2be 100644
--- a/multimedia/py-pybmp/Makefile
+++ b/multimedia/py-pybmp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	multimedia
 MASTER_SITES=	http://dev-1.borgforge.net/pyBMP/chrome/site/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module to control beep-media-player
 
 BUILD_DEPENDS=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 8c2c2f2bf4aa..dd8f0912d6ac 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Tuner for streaming internet radio and TV
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/__init__.py:${PORTSDIR}/lang/py-mx-base \
diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile
index 62db6151eca6..92b89548fa81 100644
--- a/net-im/convey/Makefile
+++ b/net-im/convey/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://convey.sourceforge.net/downloads/ \
 		http://nivi.interfree.it/tmp/convey.sourceforge.net/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	An Instant Message (IM) program using the Jabber protocol
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
diff --git a/print/easylatex/Makefile b/print/easylatex/Makefile
index a19cd4a9c705..7af19c777524 100644
--- a/print/easylatex/Makefile
+++ b/print/easylatex/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	print textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Perl script which transforms "pseudo-LaTeX" into proper LaTeX
 
 RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
diff --git a/print/latex-circ/Makefile b/print/latex-circ/Makefile
index d97ae5afc4a7..1ad0fe03d481 100644
--- a/print/latex-circ/Makefile
+++ b/print/latex-circ/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://cam.ctan.org/tex-archive/macros/generic/diagrams/ \
 PKGNAMEPREFIX=	latex-
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A LaTeX package for typesetting circuit diagrams
 
 BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
diff --git a/print/pdfmerge/Makefile b/print/pdfmerge/Makefile
index 0de21f002ed9..2dfcbf5ab530 100644
--- a/print/pdfmerge/Makefile
+++ b/print/pdfmerge/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/ \
 DISTNAME=	PDFMerge
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A shell script (with simple UI) to merge PDF files
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 33813ee1378a..6c4c6c3b4cf4 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python module for producing high quality PostScript graphics
 
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
diff --git a/sysutils/vttest/Makefile b/sysutils/vttest/Makefile
index 15996334ba8c..80793185dafb 100644
--- a/sysutils/vttest/Makefile
+++ b/sysutils/vttest/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://invisible-island.net/vttest/
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A program to test "VT100-compatibility" of terminals
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index 12b44b5111c9..935950b9219a 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.1
 CATEGORIES=	textproc print www
 MASTER_SITES=	http://www.ecromedos.net/files/${PORTVERSION}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A document preparation system that allows concurrent publication
 
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 63de20d0a2e1..d5c5196ab346 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc math www
 MASTER_SITES=	http://www.math.uio.no/~martingu/gladtex/dl/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A program to replace LaTeX formulas in HTML files with images
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index 177f248088e1..7a62664b3958 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc devel
 MASTER_SITES=	http://www2.autistici.org/bakunin/libnxml/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A C library for writing XML 1.0/1.1 files or streams
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 7b0209f2e80c..24ab1ed7859b 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	py${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${MASTER_SITE_SUBDIR}-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A spellchecking library for Python based on the Enchant library
 
 LIB_DEPENDS=	enchant.1:${PORTSDIR}/textproc/enchant
diff --git a/textproc/py-reverend/Makefile b/textproc/py-reverend/Makefile
index da0be50f1234..9ab3d5157e82 100644
--- a/textproc/py-reverend/Makefile
+++ b/textproc/py-reverend/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Reverend-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A simple Bayesian classifier written in Python
 
 USE_PYTHON=	yes
diff --git a/textproc/textogif/Makefile b/textproc/textogif/Makefile
index bf8622713b33..2fc6457d6f5d 100644
--- a/textproc/textogif/Makefile
+++ b/textproc/textogif/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.fourmilab.ch/webtools/textogif/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Perl script to convert LaTeX formulas into GIFs
 
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
diff --git a/textproc/tkxmlive/Makefile b/textproc/tkxmlive/Makefile
index 44fe3a202df7..736029263dcc 100644
--- a/textproc/tkxmlive/Makefile
+++ b/textproc/tkxmlive/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		tkxmlive-0.1.5-1
 
-MAINTAINER=		nivit@users.sourceforge.net
+MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		Tcl/Tk XML Intelligence Visual Editor
 
 RUN_DEPENDS+=		wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
diff --git a/textproc/tkxmlive/pkg-descr b/textproc/tkxmlive/pkg-descr
index 8ee26288f5ef..e4a368054330 100644
--- a/textproc/tkxmlive/pkg-descr
+++ b/textproc/tkxmlive/pkg-descr
@@ -4,4 +4,4 @@ WWW: http://tkxmlive.sourceforge.net/
 
 --
 Nicola Vitale
-nivit@users.sourceforge.net
+nivit@FreeBSD.org
diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index 9366da88e95a..e142844b6700 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=		${MASTER_SITE_APACHE} \
 MASTER_SITE_SUBDIR=	forrest
 DISTNAME=		${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=		nivit@users.sourceforge.net
+MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		A tool for rapid development of small sites
 
 USE_JAVA=		yes
diff --git a/www/apache-forrest/pkg-descr b/www/apache-forrest/pkg-descr
index eb20319c9386..c9bac5147b30 100644
--- a/www/apache-forrest/pkg-descr
+++ b/www/apache-forrest/pkg-descr
@@ -7,4 +7,4 @@ WWW: http://forrest.apache.org/
 
 --
 Nicola Vitale
-nivit@users.sourceforge.net
+nivit@FreeBSD.org
diff --git a/www/eyeos-themes/Makefile b/www/eyeos-themes/Makefile
index 8c289bafbfba..4e7fcf42e07e 100644
--- a/www/eyeos-themes/Makefile
+++ b/www/eyeos-themes/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	eyeOS-
 DISTFILES=	${EYETHEMES:S/$/.zip/}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A themes collection for eyeOS
 
 NO_BUILD=	yes
diff --git a/www/eyeos/Makefile b/www/eyeos/Makefile
index dc71dd499b1a..69c27364dd52 100644
--- a/www/eyeos/Makefile
+++ b/www/eyeos/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${DISTVERSION}a
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Web Based Desktop System
 
 NO_BUILD=	yes
diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile
index b4a7d57e2604..2e1b16394bb3 100644
--- a/www/mimetex/Makefile
+++ b/www/mimetex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://nivi.interfree.it/distfiles/${DIST_SUBDIR}/ \
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A CGI script that lets you embed LaTeX math in your HTML pages
 
 NO_WRKSUBDIR=	yes
diff --git a/www/py-cherrypy-devel/Makefile b/www/py-cherrypy-devel/Makefile
index 2907e7ee217d..a35af7bb96c8 100644
--- a/www/py-cherrypy-devel/Makefile
+++ b/www/py-cherrypy-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
 USE_PYTHON=	2.3+
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 2907e7ee217d..a35af7bb96c8 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A pythonic, object-oriented web development framework
 
 USE_PYTHON=	2.3+
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 94724ce100e8..8bfbdbee2c50 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python-Based Framework for Rapid Web Development
 
 BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile
index 94724ce100e8..8bfbdbee2c50 100644
--- a/www/py-turbogears2/Makefile
+++ b/www/py-turbogears2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python-Based Framework for Rapid Web Development
 
 BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
diff --git a/x11-toolkits/py-kiwi/Makefile b/x11-toolkits/py-kiwi/Makefile
index 3c34322b05bf..f15ea4de2fe8 100644
--- a/x11-toolkits/py-kiwi/Makefile
+++ b/x11-toolkits/py-kiwi/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.async.com.br/projects/${PORTNAME}/download/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A framework and a set of enhanced widgets based on PyGTK
 
 BUILD_DEPENDS=	pygtk-codegen-2.0:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index 2e3ed22e8800..c735f890f638 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}gui
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	nivit@email.it
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A user-friendly layer on top of wxPython
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index df93cfc90652..84c825a57e7d 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=		http://www.cs.man.ac.uk/~fellowsd/tcl/ \
 			http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
 DISTNAME=		shape${PORTVERSION:S/.//g}
 
-MAINTAINER=		nivit@users.sourceforge.net
+MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		A Tk library to access to X Shaped Window Extension
 
 LIB_DEPENDS=		tk84.1:${PORTSDIR}/x11-toolkits/tk84
diff --git a/x11-toolkits/tkshape/pkg-descr b/x11-toolkits/tkshape/pkg-descr
index 24e473d97ea3..051cc1f0ac2e 100644
--- a/x11-toolkits/tkshape/pkg-descr
+++ b/x11-toolkits/tkshape/pkg-descr
@@ -5,4 +5,4 @@ WWW: http://www.cs.man.ac.uk/~fellowsd/tcl/shapeidx.html
 
 --
 Nicola Vitale
-nivit@users.sourceforge.net
+nivit@FreeBSD.org