diff --git a/comms/c3270/Makefile b/comms/c3270/Makefile
index e7d59db79a7..79407ea6ca8 100644
--- a/comms/c3270/Makefile
+++ b/comms/c3270/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/11/28 21:16:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2009/01/30 20:26:17 naddy Exp $
 
 COMMENT=	curses-based 3270 terminal editor
 
-DISTNAME=	c3270-3.3.6
+V=		c3270-3.3.8
+DISTNAME=	${V}p3
+PKGNAME=	${V}pl3
 EXTRACT_SUFX=	.tgz
 CATEGORIES=	comms
 
@@ -17,10 +19,14 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c crypto ssl ncurses readline util
 
+MODULES=                converters/libiconv
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=x3270/}	
 
 WRKDIST=		${WRKDIR}/c3270-3.3
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 NO_REGRESS=		Yes
 
diff --git a/comms/c3270/distinfo b/comms/c3270/distinfo
index c837b4bef6d..feb05444b58 100644
--- a/comms/c3270/distinfo
+++ b/comms/c3270/distinfo
@@ -1,5 +1,5 @@
-MD5 (c3270-3.3.6.tgz) = 0+tAnEBuD/Xtmj8K5LVFLg==
-RMD160 (c3270-3.3.6.tgz) = hfm5CBIAQ9sky74wsy/kUD6/XLE=
-SHA1 (c3270-3.3.6.tgz) = xUx8EFp7KRlogv9CSWbFxs4PpR8=
-SHA256 (c3270-3.3.6.tgz) = XzrOvZk16rAHN0KwdjLnIuifLsFuowD2sgmPrSiuzFU=
-SIZE (c3270-3.3.6.tgz) = 727448
+MD5 (c3270-3.3.8p3.tgz) = GdMSMqM5CFqHQoX7lT0Tdw==
+RMD160 (c3270-3.3.8p3.tgz) = ZAlPwu/qlrexCcWo8ruMuk+ktpI=
+SHA1 (c3270-3.3.8p3.tgz) = ArBgUNl150vGO5XCzskmqHL/2b4=
+SHA256 (c3270-3.3.8p3.tgz) = Xi+yC2nW79AV0iS35x+2X/tdD1waa5hIkBL35A/06Co=
+SIZE (c3270-3.3.8p3.tgz) = 1103481
diff --git a/comms/c3270/patches/patch-Makefile_in b/comms/c3270/patches/patch-Makefile_in
new file mode 100644
index 00000000000..c8873dcf956
--- /dev/null
+++ b/comms/c3270/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2009/01/30 20:26:17 naddy Exp $
+--- Makefile.in.orig	Mon Sep 22 18:57:55 2008
++++ Makefile.in	Tue Jan 27 14:54:50 2009
+@@ -23,7 +23,7 @@ SRCS = actions.c ansi.c apl.c c3270.c charset.c child.
+ 	unicode.c unicode_dbcs.c utf8.c util.c xio.c XtGlue.c
+ VOBJS = actions.o ansi.o apl.o c3270.o charset.o child.o ctlr.o fallbacks.o \
+ 	ft.o ft_cut.o ft_dft.o glue.o help.o host.o icmd.o idle.o keymap.o \
+-	kybd.o macros.o print.o printer.o proxy.o resolver.c resources.o \
++	kybd.o macros.o print.o printer.o proxy.o resolver.o resources.o \
+ 	rpq.o screen.o see.o sf.o tables.o telnet.o toggles.o trace_ds.o \
+ 	unicode.o unicode_dbcs.o utf8.o util.o xio.o XtGlue.o
+ OBJS1 = $(VOBJS) version.o
diff --git a/comms/c3270/pkg/PLIST b/comms/c3270/pkg/PLIST
index 9e9c88d0a88..47536fc4d61 100644
--- a/comms/c3270/pkg/PLIST
+++ b/comms/c3270/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/11/28 21:16:59 naddy Exp $
-bin/c3270
-bin/pr3287
-bin/x3270if
+@comment $OpenBSD: PLIST,v 1.2 2009/01/30 20:26:17 naddy Exp $
+@bin bin/c3270
+@bin bin/pr3287
+@bin bin/x3270if