diff --git a/sysutils/ucspi-unix/Makefile b/sysutils/ucspi-unix/Makefile
index 52b9ab65f309..c3df0654754b 100644
--- a/sysutils/ucspi-unix/Makefile
+++ b/sysutils/ucspi-unix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ucspi-unix
 PORTVERSION=	0.36
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://untroubled.org/ucspi-unix/
 
@@ -17,9 +18,14 @@ BUILD_DEPENDS=	bglibs.1:${PORTSDIR}/devel/bglibs
 
 USE_REINPLACE=yes
 
-pre-build:
-	${ECHO_CMD} ${PREFIX}		> ${WRKSRC}/conf-home
-	${ECHO_CMD} ${CC} ${CFLAGS}	> ${WRKSRC}/conf-cc
+MAN1=	unixclient.1 unixserver.1
+
+post-patch:
+	${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
+	${ECHO_CMD} ${CC} ${CFLAGS} -I${LOCALBASE}/include/bglibs > ${WRKSRC}/conf-cc
+	${ECHO_CMD} ${CC} ${LDFLAGS} -s -L${LOCALBASE}/lib > ${WRKSRC}/conf-ld
+	${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
+	
 
 do-install:
 	cd ${WRKSRC} && ./installer
diff --git a/sysutils/ucspi-unix/files/patch-Makefile b/sysutils/ucspi-unix/files/patch-Makefile
deleted file mode 100644
index 356f28f8bbab..000000000000
--- a/sysutils/ucspi-unix/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Tue Sep 23 16:31:18 2003
-+++ Makefile	Tue Sep 23 16:31:37 2003
-@@ -55,7 +55,7 @@
- load: conf-ld
- 	( echo '#!/bin/sh';\
- 	  echo 'main="$$1"; shift';\
--	  echo exec `head -1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\
-+	  echo exec `head -1 conf-ld` '-L/usr/local/lib -o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\
- 	) >load
- 	chmod 755 load
- 
diff --git a/sysutils/ucspi-unix/files/patch-conf-ld b/sysutils/ucspi-unix/files/patch-conf-ld
deleted file mode 100644
index 20083382926d..000000000000
--- a/sysutils/ucspi-unix/files/patch-conf-ld
+++ /dev/null
@@ -1,7 +0,0 @@
---- conf-ld.orig	Mon Sep 29 09:52:59 2003
-+++ conf-ld	Mon Sep 29 09:53:12 2003
-@@ -1,3 +1,3 @@
--gcc -s -L/usr/local/bglibs/lib
-+gcc -s -L/usr/local/include/bglibs
- 
- This will be used to link .o and .a files into an executable.
diff --git a/sysutils/ucspi-unix/files/patch-env.c b/sysutils/ucspi-unix/files/patch-env.c
deleted file mode 100644
index abb41bc30686..000000000000
--- a/sysutils/ucspi-unix/files/patch-env.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- env.c.orig	Tue Sep 23 15:57:55 2003
-+++ env.c	Tue Sep 23 15:59:52 2003
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include <sysdeps.h>
-+#include </usr/local/include/bglibs/sysdeps.h>
- 
- extern const char* utoa(unsigned long);
- 
diff --git a/sysutils/ucspi-unix/files/patch-insthier.c b/sysutils/ucspi-unix/files/patch-insthier.c
deleted file mode 100644
index ef4e95d48294..000000000000
--- a/sysutils/ucspi-unix/files/patch-insthier.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- insthier.c.orig	Mon Jun 10 21:12:06 2002
-+++ insthier.c	Mon Sep 29 09:33:34 2003
-@@ -1,18 +1,11 @@
--#include <installer.h>
-+#include </usr/local/include/bglibs/installer.h>
- #include "conf_bin.c"
--#include "conf_man.c"
- 
- void insthier(void)
- {
-   int bin = opendir(conf_bin);
--  int man = opendir(conf_man);
--  int man1;
- 
-   c(bin, "unixcat",    -1, -1, 0755);
-   c(bin, "unixclient", -1, -1, 0755);
-   c(bin, "unixserver", -1, -1, 0755);
--
--  man1 = d(man, "man1", -1, -1, 0755);
--  c(man1, "unixclient.1", -1, -1, 0644);
--  c(man1, "unixserver.1", -1, -1, 0644);
- }
diff --git a/sysutils/ucspi-unix/files/patch-unixserver.c b/sysutils/ucspi-unix/files/patch-unixserver.c
deleted file mode 100644
index 448bc87a3d9f..000000000000
--- a/sysutils/ucspi-unix/files/patch-unixserver.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- unixserver.c.orig	Tue Sep 23 16:32:51 2003
-+++ unixserver.c	Tue Sep 23 16:33:34 2003
-@@ -7,7 +7,7 @@
- #include <sys/un.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <sysdeps.h>
-+#include </usr/local/include/bglibs/sysdeps.h>
- 
- extern void setup_env(int, const char*);
- 
diff --git a/sysutils/ucspi-unix/pkg-descr b/sysutils/ucspi-unix/pkg-descr
index 22de7cab4c5b..0a92e48f5132 100644
--- a/sysutils/ucspi-unix/pkg-descr
+++ b/sysutils/ucspi-unix/pkg-descr
@@ -1,4 +1,4 @@
-This package contains UNIX domain socket client and server programs that
-conform to UCSPI, the UNIX Client-Server Program Interface.
+UNIX domain socket client and server programs that conform to UCSPI,
+the UNIX Client-Server Program Interface.
 
 WWW: http://untroubled.org/ucspi-unix/