diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index eda413fb2cb8..097d5561fb3d 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2012/09/11 23:25:08 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/03/11 19:47:38 bsiegert Exp $
 
-DISTNAME=			mksh-R40f
+DISTNAME=			mksh-R44
 PKGNAME=			${DISTNAME:S/-R/-/}
 CATEGORIES=			shells
 MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 				http://pub.allbsd.org/MirOS/dist/mir/mksh/
-EXTRACT_SUFX=			.cpio.gz
+SITES.${DISTNAME}.cat1.gz=	${MASTER_SITES:S/dist/cats/}
+
+EXTRACT_SUFX=			.tgz
+DISTFILES=			${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.cat1.gz
 
 MAINTAINER=			ahoka@NetBSD.org
 HOMEPAGE=			http://mirbsd.de/mksh
@@ -27,10 +30,12 @@ do-build:
 	cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
 	    CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
 	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
+	${GZCAT} ${DISTDIR}/${DISTNAME}.cat1.gz > ${WRKSRC}/mksh.0
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/mksh ${DESTDIR}${PREFIX}/bin/mksh
-	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
+	${INSTALL_MAN} ${WRKSRC}/mksh.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
 	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${DESTDIR}${PREFIX}/share/examples/mksh/
 
 # Uncomment this if you want to run the regression tests
diff --git a/shells/mksh/PLIST b/shells/mksh/PLIST
index 4db18795bf70..8235aba6dbae 100644
--- a/shells/mksh/PLIST
+++ b/shells/mksh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:14:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/03/11 19:47:38 bsiegert Exp $
 bin/mksh
-man/man1/mksh.1
+man/cat1/mksh.0
 share/examples/mksh/dot.mkshrc
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index c31242c6a277..1564d187f54e 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.18 2012/05/13 18:46:35 bsiegert Exp $
+$NetBSD: distinfo,v 1.19 2013/03/11 19:47:38 bsiegert Exp $
 
-SHA1 (mksh-R40f.cpio.gz) = 3e8c1882639f9f106587748d18e336876753549f
-RMD160 (mksh-R40f.cpio.gz) = 774fabd492f3c8a998cf242710b662f808a403bc
-Size (mksh-R40f.cpio.gz) = 331196 bytes
+SHA1 (mksh-R44.cat1.gz) = 9f086affda624c53beedfd45523b40ced3b87c2e
+RMD160 (mksh-R44.cat1.gz) = 2644edb96a5def67e9c2b07b1d2a20d29c85c0ac
+Size (mksh-R44.cat1.gz) = 52261 bytes
+SHA1 (mksh-R44.tgz) = 2e575f8de79305e42fc1c7fdda2c8051482a4758
+RMD160 (mksh-R44.tgz) = 4cf1525c477c4bece519c024cc73ee6ca064d34a
+Size (mksh-R44.tgz) = 346239 bytes