diff --git a/net-libs/libnatpmp/libnatpmp-20150609.recipe b/net-libs/libnatpmp/libnatpmp-20150609.recipe
index fa47fcf32..03655281c 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.recipe
+++ b/net-libs/libnatpmp/libnatpmp-20150609.recipe
@@ -5,18 +5,18 @@ asynchronous."
 HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
 COPYRIGHT="2007-2011 Thomas Bernard"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://miniupnp.free.fr/files/libnatpmp-$portVersion.tar.gz"
 CHECKSUM_SHA256="e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0"
 SOURCE_FILENAME="libnatpmp-$portVersion.tar.gz"
 PATCHES="libnatpmp-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libnatpmp$secondaryArchSuffix = $portVersion
-	cmd:natpmpc
+	cmd:natpmpc$secondaryArchSuffix = $portVersion
 	lib:libnatpmp$secondaryArchSuffix = 1
 	"
 REQUIRES="
@@ -47,14 +47,16 @@ BUILD()
 
 INSTALL()
 {
-	make install INSTALLPREFIX=$prefix
+	mkdir -p "$binDir" "$includeDir" "$libDir"
 
-	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir
+	make install INSTALLPREFIX="$prefix" \
+		INSTALLDIRINC="$includeDir" \
+		INSTALLDIRLIB="$libDir" \
+		INSTALLDIRBIN="$binDir"
 
 	prepareInstalledDevelLibs libnatpmp
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		"$developDir"
 }