diff --git a/sys-fs/mtools/mtools-4.0.18.recipe b/sys-fs/mtools/mtools-4.0.19.recipe
similarity index 63%
rename from sys-fs/mtools/mtools-4.0.18.recipe
rename to sys-fs/mtools/mtools-4.0.19.recipe
index a9ecd3ca1..73bbb7424 100644
--- a/sys-fs/mtools/mtools-4.0.18.recipe
+++ b/sys-fs/mtools/mtools-4.0.19.recipe
@@ -6,14 +6,19 @@ In addition to file access, it supports many FAT-specific features: volume \
 labels, FAT-specific file attributes (hidden, system, ...), \"bad block\" map \
 maintenance, access to remote floppy drives, Iomega ZIP disk protection, \
 \"secure\" erase, display of file's on-disk layout, etc."
-HOMEPAGE="http://www.gnu.org/software/mtools/"
-COPYRIGHT="1997-2009 Alain Knaff"
+HOMEPAGE="https://www.gnu.org/software/mtools/"
+COPYRIGHT="1997-2018 Alain Knaff"
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="ftp://ftp.gnu.org/gnu/mtools/mtools-4.0.18.tar.bz2"
-CHECKSUM_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85"
+SOURCE_URI="https://ftpmirror.gnu.org/mtools/mtools-$portVersion.tar.lz
+	https://ftp.gnu.org/gnu/mtools/mtools-$portVersion.tar.lz"
+CHECKSUM_SHA256="e83e1428681aeb6dc87865b6d4e83d21c2cf849482d1deae802326a64cff7e12"
 
-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+GLOBAL_WRITABLE_FILES="
+	settings/mtools.conf auto-merge
+	"
 
 PROVIDES="
 	mtools = $portVersion
@@ -64,6 +69,10 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage mtools \
+	"$binDir"/mkmanifest \
+	"$binDir"/mtools \
+
 BUILD()
 {
 	runConfigure ./configure
@@ -73,4 +82,11 @@ BUILD()
 INSTALL()
 {
 	make install
+	install -m 644 mtools.conf "$settingsDir"
+	sed -i \
+		-e "s|$sysconfDir/|`finddir B_SYSTEM_SETTINGS_DIRECTORY`/|g;" \
+		"$manDir"/man1/mtools.1 \
+		"$manDir"/man5/mtools.5 \
+
+	sed -i -e "s/^SAMPLE FILE/#&/;" "$settingsDir"/mtools.conf
 }