diff --git a/lang/pcc/Makefile b/lang/pcc/Makefile
index e91b12cf58dc..badbe65ae02f 100644
--- a/lang/pcc/Makefile
+++ b/lang/pcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pcc
-DATESPEC=	081227
+DATESPEC=	090922
 PORTVERSION=	0.9.9.${DATESPEC}
 PORTREVISION?=	0
 CATEGORIES=	lang
@@ -20,12 +20,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	S.C.Johnson's Portable C Compiler brought into the C99 world.
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DATESPEC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	YACC=${YACC}
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 
 MAN1=		pcc.1 cpp.1 ccom.1
diff --git a/lang/pcc/distinfo b/lang/pcc/distinfo
index bc6ce1badcfa..6ca641baf727 100644
--- a/lang/pcc/distinfo
+++ b/lang/pcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcc-081227.tgz) = 93393dec36caa7dc2f4ec22e2c1a9f76
-SHA256 (pcc-081227.tgz) = 9fe643c2979482a565e9430019a74596df4a893e977327cb9a8fb9faeecb2cd9
-SIZE (pcc-081227.tgz) = 604716
+MD5 (pcc-090922.tgz) = 0a715a557803bbd85d086991129aa037
+SHA256 (pcc-090922.tgz) = 080bfc74382c81463309b2b29bbe1290cb5c646d58b09037b2ffd76b590a42a1
+SIZE (pcc-090922.tgz) = 625541
diff --git a/lang/pcc/files/ccconfig.h b/lang/pcc/files/ccconfig.h
index 1436444cdc1b..0dafa8f839d3 100644
--- a/lang/pcc/files/ccconfig.h
+++ b/lang/pcc/files/ccconfig.h
@@ -41,8 +41,13 @@
 #define	ENDFILES { "/usr/lib/crtend.o", "/usr/lib/crtn.o", NULL }
 #define STARTLABEL "_start"
 
+/*
+ * XXX multitargets ?
+ */
 #if defined(mach_i386) || defined(mach_x86)
 #define	CPPMDADD { "-D__i386__", "-D__i386", NULL, }
+#elif defined(mach_amd64)
+#define CPPMDADD { "-D__x86_64__", NULL, }
 #else
 #error defines for arch missing
 #endif
diff --git a/lang/pcc/files/patch-configure b/lang/pcc/files/patch-configure
new file mode 100644
index 000000000000..3bd4ecebaa3e
--- /dev/null
+++ b/lang/pcc/files/patch-configure
@@ -0,0 +1,9 @@
+Index: configure
+@@ -1956,6 +1956,7 @@
+ 	esac
+ 	case "$target_cpu" in
+ 	    i386) targmach=i386 ;;
++	    amd64) targmach=amd64 ;;
+ 	esac
+ 	;;
+