diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 0e8ab2ff25c..fe40dae6295 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.46 2008/08/27 00:35:24 martynas Exp $
+# $OpenBSD: Makefile,v 1.47 2008/09/08 15:02:41 brad Exp $
 
 COMMENT=	Secure Internet Live Conferencing (SILC) client
 
-DISTNAME=	silc-client-1.1.4
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	silc-client-1.1.5
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.silcnet.org/
 
 MAINTAINER=	Brad Smith <brad@comstyle.com>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -28,6 +27,10 @@ MASTER_SITES=	http://ftp.silcnet.org/client/sources/ \
 MODULES=	devel/gettext
 LIB_DEPENDS+=	glib-2.0.>=1000.0,gmodule-2.0.>=1000.0::devel/glib2
 
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+BUILD_DEPENDS+= :yasm-*:devel/yasm
+.endif
+
 CONFDIR=	${SYSCONFDIR}/silc
 SUBST_VARS=	CONFDIR
 
@@ -35,6 +38,9 @@ USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-shared
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+CONFIGURE_ENV+= ac_cv_path_NASM=no YASM=${LOCALBASE}/bin/yasm
+.endif
 CONFIGURE_ARGS+= --enable-ipv6 \
 		 --docdir=${PREFIX}/share/doc/silc \
 		 --sysconfdir=${CONFDIR} \
@@ -43,7 +49,7 @@ CONFIGURE_ARGS+= --enable-ipv6 \
 		 --without-libtoolfix \
 		 --with-perl=no
 
-.if ${MACHINE_ARCH} != "i386"
+.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+= --disable-asm
 .endif
 
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index d1899791f88..65d69d2e227 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1,5 +1,5 @@
-MD5 (silc-client-1.1.4.tar.gz) = l51Gx4rOLa3lE/M60AgehQ==
-RMD160 (silc-client-1.1.4.tar.gz) = XH2G/j+8D18+fjZDfv7VNATNt3w=
-SHA1 (silc-client-1.1.4.tar.gz) = z6utNg4SEXpWQgJ5kxOe+hcEO20=
-SHA256 (silc-client-1.1.4.tar.gz) = hxPZi5C4RTr422tPbqXQZsGMYND9u0OBfbj29lfx01o=
-SIZE (silc-client-1.1.4.tar.gz) = 2202993
+MD5 (silc-client-1.1.5.tar.gz) = H122s2JUkTXmj36gJvU9Zg==
+RMD160 (silc-client-1.1.5.tar.gz) = RBr0yF5pQG6+nV350TD/OUZuWSs=
+SHA1 (silc-client-1.1.5.tar.gz) = PGdimgyOmy2U3uKeBO7/GjWj/9U=
+SHA256 (silc-client-1.1.5.tar.gz) = 42zdO4ItDmSHkROgIYmMJ8AV7o74/DA+Xmk9yHdjS5Q=
+SIZE (silc-client-1.1.5.tar.gz) = 2067473
diff --git a/net/silc-client/pkg/PLIST b/net/silc-client/pkg/PLIST
index 4649ea0f4c6..37d72c101d3 100644
--- a/net/silc-client/pkg/PLIST
+++ b/net/silc-client/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.20 2007/10/01 22:03:53 simon Exp $
-bin/silc
+@comment $OpenBSD: PLIST,v 1.21 2008/09/08 15:02:41 brad Exp $
+@bin bin/silc
 @man man/man1/silc.1
 share/doc/silc/
-@comment share/doc/silc/CHANGES
 @comment share/doc/silc/COPYING
 @comment share/doc/silc/CREDITS
 share/doc/silc/FAQ