diff --git a/sysutils/paicc/Makefile b/sysutils/paicc/Makefile
index 0233ac512ff6..688cb8733526 100644
--- a/sysutils/paicc/Makefile
+++ b/sysutils/paicc/Makefile
@@ -10,8 +10,6 @@ MASTER_SITE_SUBDIR=	utils/shell
 MAINTAINER=	peter@FreeBSD.org
 COMMENT=	Paint Changed Characters
 
-MAKE_ENV=	BIN=${PREFIX}/bin MAN=${PREFIX}/man DATA=${PREFIX}/libdata
-MAN1=		paicc.1
+MAKE_ENV+=	BIN=${STAGEDIR}${PREFIX}/bin MAN=${STAGEDIR}${PREFIX}/man DATA=${STAGEDIR}${PREFIX}/libdata
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/paicc/files/patch-aa b/sysutils/paicc/files/patch-aa
index 9e4737ce1fef..78d18b8b0ebe 100644
--- a/sysutils/paicc/files/patch-aa
+++ b/sysutils/paicc/files/patch-aa
@@ -24,7 +24,7 @@
  evap.o: evap/evap.h evap/evap.c
  	@echo '  making evap.o ...'
 -	$(CC) -DP_EVAP_MM_PATH=\"$(BIN)/paiccmm.a\" -c $$CFLAGS evap/evap.c
-+	$(CC) -DP_EVAP_MM_PATH=\"$(DATA)/paiccmm.a\" -c $$CFLAGS evap/evap.c
++	$(CC) -DP_EVAP_MM_PATH=\"$(PREFIX)/libdata/paiccmm.a\" -c $$CFLAGS evap/evap.c
  
  paicc.o: paicc.c evap.o evap/evap.h evap/paicc_pdt_out
 @@ -47,14 +47,10 @@
diff --git a/sysutils/paicc/files/patch-ac b/sysutils/paicc/files/patch-ac
new file mode 100644
index 000000000000..8fb00da21d47
--- /dev/null
+++ b/sysutils/paicc/files/patch-ac
@@ -0,0 +1,25 @@
+--- paicc.c	1996-09-02 18:16:39.000000000 -0700
++++ paicc.c	2014-05-10 19:41:55.568980139 -0700
+@@ -59,10 +59,14 @@
+ 
+ */
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <curses.h>
+ #include <signal.h>
+ #include <time.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/wait.h>
+ 
+ #include "evap/evap.h"
+ #include "evap/paicc_pdt_out"
+@@ -483,6 +487,7 @@
+ 
+ } /* end window_ini */
+ 
++int
+ main(argc, argv)
+   int argc;
+   char *argv[];
diff --git a/sysutils/paicc/pkg-plist b/sysutils/paicc/pkg-plist
index 3523654950b9..0094a862bb21 100644
--- a/sysutils/paicc/pkg-plist
+++ b/sysutils/paicc/pkg-plist
@@ -1,2 +1,3 @@
 bin/paicc
 libdata/paiccmm.a
+man/man1/paicc.1.gz