diff --git a/security/samhain/Makefile b/security/samhain/Makefile
index c69cd7b9b2f2..dc6ae9e2b2e0 100644
--- a/security/samhain/Makefile
+++ b/security/samhain/Makefile
@@ -38,7 +38,7 @@
 #
 
 PORTNAME=	samhain
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.5
 CATEGORIES=	security
 MASTER_SITES=	http://la-samhna.de/archive/ \
 		http://cold.darkambient.net/
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--with-database=mysql \
 			--with-cflags=-I${LOCALBASE}/include/mysql \
 			--with-libs=-L${LOCALBASE}/lib/mysql --enable-xml-log
 .endif
-.if defined(WITH_POSTGRES)
+.if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-database=postgresql --enable-xml-log
 .endif
 .if defined(WITH_LIBWRAP)
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--with-libwrap
 .if defined(CLIENT)
 CONFIGURE_ARGS+=	--enable-network=client \
 		--with-data-file=REQ_FROM_SERVER/var/lib/samhain/data.samhain \
-		--with-config-file=REQ_FROM_SERVER --with-logserver=${LOG_SERVER}
+		--with-config-file=REQ_FROM_SERVER
 PLIST_SUB+=	SAMHAIN="" SETPWD="" YULE="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/fixsamhainrc.patch
 MAN5=	samhainrc.5
@@ -95,6 +95,9 @@ EXTRA_PATCHES+=	${FILESDIR}/fixsamhainrc.patch
 MAN5=	samhainrc.5
 MAN8=	samhain.8
 .endif
+.if defined(LOG_SERVER)
+CONFIGURE_ARGS+=	--with-logserver=${ALT_LOG_SERVER}
+.endif
 .if defined(ALT_LOG_SERVER)
 CONFIGURE_ARGS+=	--with-altlogserver=${ALT_LOG_SERVER}
 .endif
@@ -116,14 +119,6 @@ pre-everything::
 .error "Can't build client and server at once!"
 .endif
 
-.if defined(CLIENT) && !defined(LOG_SERVER)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Please define LOG_SERVER (and ALT_LOG_SERVER, if "
-	@${ECHO_MSG} "applicable), the machine(s) this client will log to."
-	@${ECHO_MSG}
-.error "Please define LOG_SERVER."
-.endif
-
 .if defined(WITH_KCHECK)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Building with kernel checking requires reading /dev/kmem."
diff --git a/security/samhain/distinfo b/security/samhain/distinfo
index 1932cfedc47d..52e77fc62f8d 100644
--- a/security/samhain/distinfo
+++ b/security/samhain/distinfo
@@ -1,2 +1,2 @@
-MD5 (samhain_signed-1.8.4.tar.gz) = fc406318c8b800ecf5778e097c7f19bd
-SIZE (samhain_signed-1.8.4.tar.gz) = 912597
+MD5 (samhain_signed-1.8.5.tar.gz) = cfe370c146e69d90bd003197b63c5092
+SIZE (samhain_signed-1.8.4.tar.gz) = 912865