diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 954c47249576..369d07ef2113 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apcupsd
 PORTVERSION=	3.10.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,7 @@ PLIST_SUB=	STARTUP_SCRIPT=${STARTUP_SCRIPT}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --sbindir=${PREFIX}/sbin \
+		--with-nologin=/var/run \
 		--disable-install-distdir --enable-usb \
 		--sysconfdir=${PREFIX}/etc/apcupsd \
 		--with-serial-dev=/dev/usv \
diff --git a/sysutils/apcupsd/files/patch-configure-internal-libgd b/sysutils/apcupsd/files/patch-configure-internal-libgd
new file mode 100644
index 000000000000..a7e914528de4
--- /dev/null
+++ b/sysutils/apcupsd/files/patch-configure-internal-libgd
@@ -0,0 +1,13 @@
+*** configure.org	Sun Jan 18 17:20:53 2004
+--- configure	Sun Jan 18 17:21:48 2004
+***************
+*** 8924,8929 ****
+--- 8924,8931 ----
+  fi
+  
+       fi
++      # Always use internal libgd LK!!!
++      SYS_GD_FOUND=no
+       if test "${SYS_GD_FOUND}" = "no"
+       then
+         if test -d src/gd1.2