diff --git a/sbin/Makefile b/sbin/Makefile
index ade73fc8b0e..b4da5868045 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -93,10 +93,6 @@ SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=
 
-# Add architecture-specific manpages
-# to be included anyway
-MAN=   sconfig/sconfig.8
-
 .include <bsd.prog.mk>
 
 .include <bsd.subdir.mk>
diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64
index 2d231b0cb2b..4135c44082c 100644
--- a/sbin/Makefile.amd64
+++ b/sbin/Makefile.amd64
@@ -2,3 +2,4 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += sconfig
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index bce914f4086..96fb46434d7 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -4,7 +4,7 @@
 PACKAGE=runtime
 PROG=	sconfig
 MAN=	sconfig.8
-MANSUBDIR= /i386
 WARNS?=	2
+CFLAGS+=	-I${SRCTOP}/sys/dev/cp
 
 .include <bsd.prog.mk>
diff --git a/sbin/sconfig/sconfig.c b/sbin/sconfig/sconfig.c
index eebf6013e16..48363036e41 100644
--- a/sbin/sconfig/sconfig.c
+++ b/sbin/sconfig/sconfig.c
@@ -29,10 +29,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <machine/cserial.h>
+#include "cserial.h"
 
 #define MAXCHAN 128