diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 1bb62d6e441..bba3c2d7d09 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2004/12/11 04:59:46 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.37 2004/12/29 16:44:10 pvalchev Exp $
 # $NetBSD: Makefile,v 1.37 2004/10/03 00:13:16 tv Exp $
 
 COMMENT=	"tools to connect your PalmOSŪ compatible handheld"
@@ -32,6 +32,10 @@ LIB_DEPENDS=		png.4::graphics/png
 BROKEN=		"You must remove the existing pilot-link installation before compiling this version"
 .endif
 
+.if ${MACHINE_ARCH} == "powerpc"
+PATCH_LIST=		patch-* gcc-*
+.endif
+
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/comms/pilot-link/patches/gcc-src_pilot-datebook_Makefile_in b/comms/pilot-link/patches/gcc-src_pilot-datebook_Makefile_in
new file mode 100644
index 00000000000..9fbf4ccede2
--- /dev/null
+++ b/comms/pilot-link/patches/gcc-src_pilot-datebook_Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: gcc-src_pilot-datebook_Makefile_in,v 1.1 2004/12/29 16:44:10 pvalchev Exp $
+--- src/pilot-datebook/Makefile.in.orig	Wed Dec 29 09:42:12 2004
++++ src/pilot-datebook/Makefile.in	Wed Dec 29 09:43:03 2004
+@@ -181,8 +181,8 @@ LIBS = @LIBS@
+ @NEED_GETOPT_TRUE@pilot-datebook-windat.$(OBJEXT)
+ pilot_datebook_DEPENDENCIES =  $(top_builddir)/libpisock/libpisock.la
+ pilot_datebook_LDFLAGS = 
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fno-stack-protector
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fno-stack-protector
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  README COPYING Makefile.am Makefile.in parsedate.c