diff --git a/pkgfs.sh b/pkgfs.sh
index 398c78cfaf2..270631ae4b1 100755
--- a/pkgfs.sh
+++ b/pkgfs.sh
@@ -493,6 +493,8 @@ build_tmpl_sources()
 				--exec-prefix="$PKGFS_DESTDIR/$pkgname" \
 				--mandir="$PKGFS_DESTDIR/$pkgname/man" \
 				--infodir="$PKGFS_DESTDIR/$pkgname/share/info" \
+				--libdir="$PKGFS_MASTERDIR/lib" \
+				--includedir="$PKGFS_MASTERDIR/include" \
 				${configure_args}
 
 	#
diff --git a/templates/libidn-1.9.tmpl b/templates/libidn-1.9.tmpl
index 145f9b1039b..cad4dd130de 100755
--- a/templates/libidn-1.9.tmpl
+++ b/templates/libidn-1.9.tmpl
@@ -4,8 +4,7 @@ extract_sufx=".tar.gz"
 url=http://ftp.gnu.org/gnu/libidn
 build_style=gnu_configure
 configure_env="EMACS=/bin/false"
-configure_args="--disable-csharp --disable-java
- --libdir=$PKGFS_MASTERDIR/lib"
+configure_args="--disable-csharp --disable-java"
 short_desc="Internationalized Domain Names command line tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3b2217f015965600b69983cf831746a591f0680e