diff --git a/templates/e2fsprogs/devel.template b/templates/e2fsprogs/devel.template
index 9366beac1a8..723b4576c6b 100644
--- a/templates/e2fsprogs/devel.template
+++ b/templates/e2fsprogs/devel.template
@@ -9,20 +9,22 @@ Add_dependency run e2fsprogs-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/lib
 	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/bin
 	mkdir -p ${DESTDIR}/usr/share/info
 	mkdir -p ${DESTDIR}/usr/share/man/man1
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 	for f in compile_et mk_cmds; do
-		mv ${SRCPKGDESTDIR}/bin/${f} ${DESTDIR}/usr/bin
+		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
 		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}* \
 			${DESTDIR}/usr/share/man/man1
 	done
+	mv ${SRCPKGDESTDIR}/usr/share/et ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/ss ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
 	mv ${SRCPKGDESTDIR}/usr/share/info/libext2fs.info* \
 		${DESTDIR}/usr/share/info
diff --git a/templates/e2fsprogs/template b/templates/e2fsprogs/template
index 570e81ddf20..6b3a0b77470 100644
--- a/templates/e2fsprogs/template
+++ b/templates/e2fsprogs/template
@@ -5,18 +5,8 @@ version=1.41.4
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-htree --enable-elf-shlibs --enable-fsck
- --enable-e2initrd-helper --disable-rpath --bindir=/bin --sbindir=/sbin
- --libdir=/usr/lib --includedir=/usr/include"
-make_install_target="install-libs install"
-make_install_args="
-root_bindir=$XBPS_DESTDIR/$pkgname-$version/bin
-bindir=$XBPS_DESTDIR/$pkgname-$version/bin
-root_sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin
-sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin
-root_libdir=$XBPS_DESTDIR/$pkgname-$version/usr/lib
-libdir=$XBPS_DESTDIR/$pkgname-$version/usr/lib
-root_includedir=$XBPS_DESTDIR/$pkgname-$version/usr/include
-includedir=$XBPS_DESTDIR/$pkgname-$version/usr/include"
+ --enable-e2initrd-helper --disable-rpath --with-root-prefix="
+make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install-libs install"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
@@ -25,12 +15,6 @@ long_desc="
  It also supports the ext3 filesystem with journaling support."
 
 subpackages="devel libs"
+conf_files="/etc/mke2fs.conf"
 Add_dependency run glibc
 Add_dependency run e2fsprogs-libs
-
-post_install()
-{
-	# Move libraries to /lib.
-	install -d ${DESTDIR}/lib
-	mv ${DESTDIR}/usr/lib/lib* ${DESTDIR}/lib
-}