diff --git a/productivity/siag/Makefile b/productivity/siag/Makefile
index fddb9405c47..f38a84163ee 100644
--- a/productivity/siag/Makefile
+++ b/productivity/siag/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/04 21:25:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2008/12/01 19:23:54 jasper Exp $
 
 COMMENT=		tightly integrated, free office package
 
 VERSION=		3.6.1
 DISTNAME=		siag-${VERSION}
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		productivity x11
 
 HOMEPAGE=		http://siag.nu/
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/productivity/siag/patches/patch-egon_siodi_c b/productivity/siag/patches/patch-egon_siodi_c
new file mode 100644
index 00000000000..347195f6114
--- /dev/null
+++ b/productivity/siag/patches/patch-egon_siodi_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-egon_siodi_c,v 1.1 2008/12/01 19:23:55 jasper Exp $
+--- egon/siodi.c.orig	Mon Dec  1 13:36:31 2008
++++ egon/siodi.c	Mon Dec  1 13:36:42 2008
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <ctype.h>
+ 
+ #include "egon.h"
diff --git a/productivity/siag/patches/patch-xfiler_Errors_c b/productivity/siag/patches/patch-xfiler_Errors_c
new file mode 100644
index 00000000000..e34186dc2da
--- /dev/null
+++ b/productivity/siag/patches/patch-xfiler_Errors_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-xfiler_Errors_c,v 1.1 2008/12/01 19:23:55 jasper Exp $
+--- xfiler/Errors.c.orig	Mon Dec  1 13:34:58 2008
++++ xfiler/Errors.c	Mon Dec  1 13:35:11 2008
+@@ -8,6 +8,7 @@
+ -----------------------------------------------------------------------------*/
+ 
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
diff --git a/productivity/siag/patches/patch-xfiler_Exec_c b/productivity/siag/patches/patch-xfiler_Exec_c
new file mode 100644
index 00000000000..71415a501c5
--- /dev/null
+++ b/productivity/siag/patches/patch-xfiler_Exec_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-xfiler_Exec_c,v 1.1 2008/12/01 19:23:55 jasper Exp $
+--- xfiler/Exec.c.orig	Mon Dec  1 13:34:35 2008
++++ xfiler/Exec.c	Mon Dec  1 13:34:52 2008
+@@ -7,6 +7,7 @@
+   Procedures for executing files
+ ---------------------------------------------------------------------------*/
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <memory.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/productivity/siag/patches/patch-xfiler_tycoon_c b/productivity/siag/patches/patch-xfiler_tycoon_c
new file mode 100644
index 00000000000..b883c597f3d
--- /dev/null
+++ b/productivity/siag/patches/patch-xfiler_tycoon_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-xfiler_tycoon_c,v 1.1 2008/12/01 19:23:55 jasper Exp $
+--- xfiler/tycoon.c.orig	Mon Dec  1 13:33:51 2008
++++ xfiler/tycoon.c	Mon Dec  1 13:34:14 2008
+@@ -1,6 +1,7 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/Xatom.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ extern void ExecExternalApplication(Display *dpy, int x, int y, char *label, 
+ 				    char *icon,char *cmd,char *drop,char *dir);
diff --git a/productivity/siag/pkg/PLIST b/productivity/siag/pkg/PLIST
index f8aff06f968..eafa1552c60 100644
--- a/productivity/siag/pkg/PLIST
+++ b/productivity/siag/pkg/PLIST
@@ -1,28 +1,28 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/08/30 07:48:26 jasper Exp $
-bin/egon
-bin/gvu
+@comment $OpenBSD: PLIST,v 1.5 2008/12/01 19:23:55 jasper Exp $
+@bin bin/egon
+@bin bin/gvu
 bin/mgptotxt
-bin/pw
-bin/runcmd
-bin/siag
+@bin bin/pw
+@bin bin/runcmd
+@bin bin/siag
 bin/siaghelp
 bin/siagrun
-bin/tsiag
-bin/xedplus
-bin/xfiler
+@bin bin/tsiag
+@bin bin/xedplus
+@bin bin/xfiler
 lib/siag/
 lib/siag/o3read/
-lib/siag/o3read/dbtohtml
-lib/siag/o3read/o3tohtml
-lib/siag/o3read/utf8tolatin1
+@bin lib/siag/o3read/dbtohtml
+@bin lib/siag/o3read/o3tohtml
+@bin lib/siag/o3read/utf8tolatin1
 lib/siag/plugins/
-lib/siag/plugins/clipart
-lib/siag/plugins/dummy
-lib/siag/plugins/form
-lib/siag/plugins/hello
-lib/siag/plugins/image
-lib/siag/plugins/plot
-lib/siag/plugins/text
+@bin lib/siag/plugins/clipart
+@bin lib/siag/plugins/dummy
+@bin lib/siag/plugins/form
+@bin lib/siag/plugins/hello
+@bin lib/siag/plugins/image
+@bin lib/siag/plugins/plot
+@bin lib/siag/plugins/text
 @man man/man1/dummy_plugin.1
 @man man/man1/egon.1
 @man man/man1/gvu.1