diff --git a/srcpkgs/vpcs/patches/musl.patch b/srcpkgs/vpcs/patches/musl.patch
new file mode 100644
index 0000000000..87eb70a5a7
--- /dev/null
+++ b/srcpkgs/vpcs/patches/musl.patch
@@ -0,0 +1,22 @@
+--- src/remote.c.orig
++++ src/remote.c
+@@ -34,6 +34,8 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <netinet/tcp.h>
++#include <sys/types.h>
+ #include <arpa/inet.h>
+ 
+ #include <net/if.h>
+
+--- src/hv.c.orig
++++ src/hv.c
+@@ -42,7 +42,6 @@
+ #include <fcntl.h>
+ 
+ #include <libgen.h>
+-#include <getopt.h>
+ #include <pthread.h>
+ #include <termios.h>
+ 
diff --git a/srcpkgs/vpcs/patches/remote_musl.patch b/srcpkgs/vpcs/patches/remote_musl.patch
deleted file mode 100644
index 80c069c720..0000000000
--- a/srcpkgs/vpcs/patches/remote_musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/remote.c.orig	2017-01-20 16:46:45.037618348 -0600
-+++ src/remote.c	2017-01-20 16:47:18.504616161 -0600
-@@ -43,13 +43,13 @@
- #include "readline.h"
- #include "utils.h"
- 
--int open_remote(int fdio, const char *destip, const u_short destport)
-+int open_remote(int fdio, const char *destip, const unsigned short destport)
- {
- 	int s;
- 	struct sockaddr_in addr_in;
- 	struct termios termios;
- 	char kb[512];
--	u_char outbuf[512];
-+	unsigned char outbuf[512];
- 	int rc;
- 	int i;
- 	struct timeval tv;
diff --git a/srcpkgs/vpcs/template b/srcpkgs/vpcs/template
index 875583da35..fd9420148c 100644
--- a/srcpkgs/vpcs/template
+++ b/srcpkgs/vpcs/template
@@ -1,27 +1,27 @@
 # Template file for 'vpcs'
 pkgname=vpcs
 version=0.8
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
-makedepends="glibc-devel"
+make_cmd="make -f Makefile.linux"
 short_desc="Virtual PC Simulator"
 maintainer="Michael Aldridge <maldridge@VoidLinux.eu>"
-license="BSD 2-Clause"
+license="2-clause-BSD"
 homepage="https://sourceforge.net/projects/vpcs"
 distfiles="${SOURCEFORGE_SITE}/project/vpcs/${version}/${pkgname}-${version}-src.tbz"
 checksum=dca602d0571ba852c916632c4c0060aa9557dd744059c0f7368860cfa8b3c993
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken=yes # depends on GNU getopt
-	;;
-esac
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 
 pre_build() {
-	ln -s Makefile.linux Makefile
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) sed -i "s|i386|amd64|" Makefile.linux;;
+	esac
 }
 
 do_install() {
 	vbin vpcs
-	vlicense $wrksrc/COPYING
+	vman ${wrksrc}/man/vpcs.1
+	vlicense ${wrksrc}/COPYING
 }