diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 7cb7eea07..2e1f77215 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -51,11 +51,19 @@ MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 DEPENDS+=		pkg_install>=20130901:../../pkgtools/pkg_install
 
+.if (${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix")
+CONFIGURE_ENV += ac_cv_func_tcgetpgrp=no
+.endif
+
 # those have official repositories
 .if !empty(PKGIN_REPOSITORY_URL)
 pre-install:
 	${ECHO} ${PKGIN_REPOSITORY_URL} >> ${WRKSRC}/repositories.conf
-.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
+.elif ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+pre-install:
+	${GREP} -i Minix ${WRKSRC}/REPOSITORIES >> 			\
+		${WRKSRC}/repositories.conf
+.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 pre-install:
 	${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> 			\
 		${WRKSRC}/repositories.conf
@@ -78,6 +86,12 @@ do-install:
 		${DESTDIR}${EGDIR}/repositories.conf.example
 	${INSTALL_DATA} ${WRKSRC}/preferred.conf			\
 		${DESTDIR}${EGDIR}/preferred.conf.example
+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+# LSC: We install this fragment only now, as it interfers with the bootstrap
+#      process otherwise.
+	${MKDIR} ${DESTDIR}${PREFIX}/etc
+	${INSTALL_DATA} ../../minix/mk.conf.minix ${DESTDIR}${PREFIX}/etc/mk.conf
+.endif
 
 # libfetch has no builtin.mk and is included in NetBSD>=5
 .if ${OPSYS} != "NetBSD" || \
diff --git a/pkgtools/pkgin/PLIST b/pkgtools/pkgin/PLIST
index f31ecd8e0..6839612e3 100644
--- a/pkgtools/pkgin/PLIST
+++ b/pkgtools/pkgin/PLIST
@@ -4,3 +4,4 @@ man/cat1/pkgin.0
 man/man1/pkgin.1
 share/examples/pkgin/preferred.conf.example
 share/examples/pkgin/repositories.conf.example
+etc/mk.conf
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index 30053cb9e..670f29514 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -4,3 +4,4 @@ SHA1 (pkgin-0.9.4.tar.gz) = ecae9164da8cafb1599aaa7e63b26722101ed83d
 RMD160 (pkgin-0.9.4.tar.gz) = 6c9b025deb648d223503e548d3a3e531beffb058
 SHA512 (pkgin-0.9.4.tar.gz) = c1fa629fb65f0f275d7fd5f4c85eb2cdb1a9e3917b15f9daeef175ba17bb4ade5c804af10cc0e7bb307cd18a04e47b6cf9f179d12051522224dea56b43420f97
 Size (pkgin-0.9.4.tar.gz) = 198399 bytes
+SHA1 (patch-zz-minix) = 6860ab8758fd7ae4f2dd427ae39aa3c37b3f8226
diff --git a/pkgtools/pkgin/patches/patch-zz-minix b/pkgtools/pkgin/patches/patch-zz-minix
new file mode 100644
index 000000000..2a02e244d
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-zz-minix
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- REPOSITORIES.orig	Wed May  7 15:48:08 2014
++++ REPOSITORIES
+@@ -1,4 +1,4 @@
+ # NetBSD OS release can look like 6.0_STABLE, do not use it as-is
+ ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/@OSREL@/All
+ http://mirror-master.dragonflybsd.org/packages/$arch/DragonFly-$osrelease/stable/All/
+-ftp://ftp.minix3.org/pub/minix/packages/$osrelease/$arch/All
++http://www.minix3.org/pkgsrc/packages/$osrelease/$arch/All