diff --git a/net/irssi-silc/Makefile b/net/irssi-silc/Makefile
index 139b24cdb07..723eaac6f0a 100644
--- a/net/irssi-silc/Makefile
+++ b/net/irssi-silc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2008/03/31 03:32:33 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2008/07/11 01:51:23 martynas Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	SILC plugin for irssi
 
 VERSION=	1.1.4
 DISTNAME=	silc-client-${VERSION}
-PKGNAME=	irssi-silc-${VERSION}
+PKGNAME=	irssi-silc-${VERSION}p0
 
 CATEGORIES=	net
 
diff --git a/net/irssi-silc/patches/patch-lib_silcmath_tma_c b/net/irssi-silc/patches/patch-lib_silcmath_tma_c
deleted file mode 100644
index b6187738680..00000000000
--- a/net/irssi-silc/patches/patch-lib_silcmath_tma_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-lib_silcmath_tma_c,v 1.1 2007/11/18 17:36:18 martynas Exp $
---- lib/silcmath/tma.c.orig	Thu May  3 11:13:16 2007
-+++ lib/silcmath/tma.c	Wed Jun 13 22:55:31 2007
-@@ -1570,6 +1570,7 @@ tma_mp_count_bits (tma_mp_int * a)
-  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
-  */
- 
-+#define BN_MP_DIV_SMALL
- #ifdef BN_MP_DIV_SMALL
- 
- /* slower bit-bang division... also smaller */
diff --git a/net/irssi-silc/patches/patch-lib_silcmath_tma_h b/net/irssi-silc/patches/patch-lib_silcmath_tma_h
new file mode 100644
index 00000000000..788b601a2ba
--- /dev/null
+++ b/net/irssi-silc/patches/patch-lib_silcmath_tma_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_silcmath_tma_h,v 1.1 2008/07/11 01:51:23 martynas Exp $
+--- lib/silcmath/tma.h.orig	Thu May  3 11:13:16 2007
++++ lib/silcmath/tma.h	Fri Feb 29 23:36:31 2008
+@@ -51,7 +51,7 @@ extern "C" {
+ 
+ 
+ /* detect 64-bit mode if possible */
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && !defined(__OpenBSD__)
+    #if !(defined(MP_64BIT) && defined(MP_16BIT) && defined(MP_8BIT))
+       #define MP_64BIT
+    #endif