diff --git a/net/nam/Makefile b/net/nam/Makefile
index 6382c2212b7..703a683b077 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/11/19 22:31:35 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2011/01/05 19:07:59 sebastia Exp $
 # $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $
 
 COMMENT=	UCB/LBNL Network Animator
@@ -6,7 +6,7 @@ COMMENT=	UCB/LBNL Network Animator
 V=		1.13
 DISTNAME=	nam-src-$V
 PKGNAME=	nam-$V
-REVISION=	0
+REVISION=	1
 CATEGORIES=	net
 
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE:=nsnam/}
@@ -19,7 +19,11 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=		X11 Xext c m otcl pthread-stubs stdc++ tcl84 tk84 xcb z
+MODULES	+=		x11/tk
+MODTK_VERSION =		8.4
+WANTLIB +=		X11 Xext c m otcl stdc++ z
+WANTLIB +=		${MODTK_WANTLIB}
+LIB_DEPENDS +=		${MODTK_LIB_DEPENDS}
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	devel/tclcl>=1.0b13p0
@@ -27,13 +31,15 @@ RUN_DEPENDS=	devel/tclcl>=1.0b13p0
 WRKDIST=	${WRKDIR}/nam-$V
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4 \
+CONFIGURE_ARGS=	--with-tcl-ver=${MODTCL_VERSION} \
+		--with-tk-ver=${MODTK_VERSION} \
+		--with-tk=${MODTK_LIBDIR} \
+		--with-tcl=${MODTCL_LIBDIR} \
 		--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib
 
 ALL_TARGET=
 
-USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 pre-configure:
diff --git a/net/nam/patches/patch-configure b/net/nam/patches/patch-configure
index 5af89800ae0..8b8d131f845 100644
--- a/net/nam/patches/patch-configure
+++ b/net/nam/patches/patch-configure
@@ -1,6 +1,60 @@
-$OpenBSD: patch-configure,v 1.5 2010/10/12 20:13:47 jasper Exp $
+$OpenBSD: patch-configure,v 1.6 2011/01/05 19:07:59 sebastia Exp $
 --- configure.orig	Sun Feb 18 23:45:44 2007
-+++ configure	Sat Oct 13 22:18:21 2007
++++ configure	Thu Dec 23 13:24:03 2010
+@@ -1063,7 +1063,7 @@ do
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++    *" "*|*"	"*|*[\[\]\~\#\$^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+@@ -1279,7 +1279,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++    *" "*|*"	"*|*[\[\]\~\#\$^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+@@ -5673,7 +5673,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TCL_H_PLACES_D"
++		places="$TCL_H_PLACES_D $TCL_H_PLACES" 
+ 	fi
+ 
+ 	V_INCLUDE_TCL=""
+@@ -5732,7 +5732,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TCL_LIB_PLACES_D"
++		places="$TCL_LIB_PLACES_D $TCL_LIB_PLACES"
+ 	fi
+ 
+ 	V_LIB_TCL=""
+@@ -6119,7 +6119,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TK_H_PLACES_D"
++		places="$TK_H_PLACES_D $TK_H_PLACES"
+ 	fi
+ 
+ 	V_INCLUDE_TK=""
+@@ -6178,7 +6178,7 @@ else
+ echo "$as_me: error: $d is not a directory" >&2;}
+    { (exit 1); exit 1; }; }
+ 		fi
+-		places="$TK_LIB_PLACES_D"
++		places="$TK_LIB_PLACES_D $TK_LIB_PLACES"
+ 	fi
+ 
+ 	V_LIB_TK=""
 @@ -6739,7 +6739,7 @@ TCLCL_H_PLACES="\
                  /usr/src/local/Tcl \
                  /usr/src/local/Tcl-1.0 \
diff --git a/net/nam/pkg/PLIST b/net/nam/pkg/PLIST
index bb01d318477..4be8b70db46 100644
--- a/net/nam/pkg/PLIST
+++ b/net/nam/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:42 espie Exp $
-bin/nam
+@comment $OpenBSD: PLIST,v 1.5 2011/01/05 19:07:59 sebastia Exp $
+@bin bin/nam
 @man man/man1/nam.1
 share/examples/nam/
 share/examples/nam/9nodetree.nam