diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
index 0d5c191c8..679031c71 100644
--- a/lib/libc/arch/arm/Makefile.inc
+++ b/lib/libc/arch/arm/Makefile.inc
@@ -21,4 +21,8 @@ SRCS+=	fixunsgen64_ieee754.c fixunsdfsi_ieee754.c
 SOFTFLOAT_BITS=32
 .endif
 
+.if defined(__MINIX)
+.include "${LIBCDIR}/softfloat/Makefile.inc"
+.else
 .include <softfloat/Makefile.inc>
+.endif
diff --git a/lib/libc/softfloat/Makefile.inc b/lib/libc/softfloat/Makefile.inc
index d31d18768..33dbd3f30 100644
--- a/lib/libc/softfloat/Makefile.inc
+++ b/lib/libc/softfloat/Makefile.inc
@@ -1,10 +1,19 @@
 #	$NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
 
 SOFTFLOAT_BITS?=64
+.if defined(__MINIX)
+.PATH:		${ARCHDIR}/softfloat \
+		${LIBCDIR}/softfloat/bits${SOFTFLOAT_BITS} ${LIBCDIR}/softfloat
+.else
 .PATH:		${ARCHDIR}/softfloat \
 		${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
+.endif
 
+.if defined(__MINIX)
+CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${LIBCDIR}/softfloat
+.else
 CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat
+.endif
 CPPFLAGS+=	-DSOFTFLOAT_FOR_GCC
 
 SRCS.softfloat= softfloat.c
diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile
index 442b848be..477ad0635 100644
--- a/lib/libminc/Makefile
+++ b/lib/libminc/Makefile
@@ -9,6 +9,7 @@ LIB=		minc
 CPPFLAGS.sched_start.c+=	-I${NETBSDSRCDIR}
 
 LIBCSRCDIR=	${NETBSDSRCDIR}/lib/libc
+LIBCDIR=	${NETBSDSRCDIR}/lib/libc
 CPPFLAGS+=      -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}
 CPPFLAGS+=	-D_LIBMINC
 
@@ -144,7 +145,7 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/locale
 
 # Import from sys-minix
 .for i in access.c brk.c close.c environ.c execve.c fork.c \
-	getgid.c getpid.c getuid.c gettimeofday.c loadname.c \
+	getgid.c getpid.c geteuid.c getuid.c gettimeofday.c loadname.c \
 	link.c _mcontext.c mknod.c mmap.c nanosleep.c open.c \
 	read.c sbrk.c select.c setuid.c sigprocmask.c stat.c \
 	stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
@@ -156,4 +157,9 @@ SRCS+= ${i}
 
 CPPFLAGS+= -D_LIBSYS
 
+.if exists (${ARCHDIR}/Makefile.inc)
+.PATH:  ${ARCHDIR}
+.include "${ARCHDIR}/Makefile.inc"
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 593888e40..915884eaa 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -700,6 +700,7 @@ setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
 	}
 	errno = 0;
 
+#ifndef __minix
 	if (flags & LOGIN_SETLOGIN)
 		if (setlogin(pwd->pw_name) == -1) {
 			syslog(LOG_ERR, "setlogin(%s) failure: %m",
@@ -707,6 +708,7 @@ setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
 			login_close(flc);
 			return (-1);
 		}
+#endif
 
 	if (flags & LOGIN_SETUSER)
 		if (setuid(uid) == -1) {