diff --git a/net-mgmt/openvmps/Makefile b/net-mgmt/openvmps/Makefile
index 4a3bad3d5ab4..7a237cd7c6dd 100644
--- a/net-mgmt/openvmps/Makefile
+++ b/net-mgmt/openvmps/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	openvmps
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4.04
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/vmps/vmpsd/${PORTVERSION}
 DISTNAME=	vmpsd-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GPL implementation of the VMPS protocol
+COMMENT=	GPL implementation of the VMPS protocol
 
-WRKSRC=		${WRKDIR}/vmpsd
-USE_RC_SUBR=	vpmsd
+LICENSE=	GPLv2
+
+USE_RC_SUBR=	vmpsd
 
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--bindir=${PREFIX}/sbin
 
 MAN1=		vmpsd.1
@@ -27,11 +26,14 @@ MAN1=		vmpsd.1
 IGNORE=		does not run correctly on amd64 architecture, see ports/136376
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^install-exec-am:/s|install-sysconfDATA||' \
+		${WRKSRC}/Makefile.in
+
 post-install:
-	${INSTALL_DATA} -m 644 ${WRKSRC}/vlan.db \
-		${PREFIX}/etc/vmps.db.sample
-	@if [ ! -f ${PREFIX}/etc/vmps.db ]; then \
-		${CP} -p ${PREFIX}/etc/vmps.db.sample ${PREFIX}/etc/vmps.db ; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/vlan.db ${PREFIX}/etc/vmps.db.sample
+.if !exists(${PREFIX}/etc/vmps.db)
+	cd ${PREFIX}/etc && ${CP} -p vmps.db.sample vmps.db
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/openvmps/distinfo b/net-mgmt/openvmps/distinfo
index f3da342ac187..cb357f8e5407 100644
--- a/net-mgmt/openvmps/distinfo
+++ b/net-mgmt/openvmps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vmpsd-1.3.tar.gz) = 6f6bd6c5d1e9fc862c27cf783bcbabef21619aa5fe7984231eb55e32e11ca142
-SIZE (vmpsd-1.3.tar.gz) = 95202
+SHA256 (vmpsd-1.4.04.tar.gz) = 3b82ed9547eb126ffbefdd9b890870ebfac466c0bc93cfea1764a360772912ab
+SIZE (vmpsd-1.4.04.tar.gz) = 193900
diff --git a/net-mgmt/openvmps/files/patch-Makefile.in b/net-mgmt/openvmps/files/patch-Makefile.in
deleted file mode 100644
index 1e707623a6a7..000000000000
--- a/net-mgmt/openvmps/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Jan 25 18:16:11 2005
-+++ Makefile.in	Tue Jan 25 18:17:02 2005
-@@ -684,7 +684,7 @@
- 
- install-data-am: install-man
- 
--install-exec-am: install-binPROGRAMS install-sysconfDATA
-+install-exec-am: install-binPROGRAMS
- 
- install-info: install-info-am
- 
diff --git a/net-mgmt/openvmps/files/patch-daemon.c b/net-mgmt/openvmps/files/patch-daemon.c
deleted file mode 100644
index 15be7ddf0b99..000000000000
--- a/net-mgmt/openvmps/files/patch-daemon.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- daemon.c.orig	Tue Jan 25 18:00:12 2005
-+++ daemon.c	Tue Jan 25 18:00:47 2005
-@@ -44,7 +44,10 @@
- 
- {
- 	register int	childpid;
--
-+#ifdef	VMPS_CHECK_BSD
-+	int fd;
-+#endif
-+	
- #ifdef	SIGTTOU
- 	signal(SIGTTOU, SIG_IGN);
- #endif
diff --git a/net-mgmt/openvmps/files/patch-data.c b/net-mgmt/openvmps/files/patch-data.c
new file mode 100644
index 000000000000..0c3f1b006c14
--- /dev/null
+++ b/net-mgmt/openvmps/files/patch-data.c
@@ -0,0 +1,11 @@
+--- data.c.orig	2012-11-10 16:26:08.000000000 +0100
++++ data.c	2012-11-10 16:27:30.000000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ void *xfree(void *p) {
+ 
+-	if (p == NULL) return;
++	if (p == NULL) return NULL;
+ 	vmps_log(DEBUG|SYSTEM, "FREE: %x",p);
+ 	free(p);
+ }
diff --git a/net-mgmt/openvmps/files/vpmsd.in b/net-mgmt/openvmps/files/vmpsd.in
similarity index 100%
rename from net-mgmt/openvmps/files/vpmsd.in
rename to net-mgmt/openvmps/files/vmpsd.in