diff --git a/dev-cpp/mxml/mxml-2.6.recipe b/dev-libs/mini-xml/mini_xml-2.6.recipe
similarity index 64%
rename from dev-cpp/mxml/mxml-2.6.recipe
rename to dev-libs/mini-xml/mini_xml-2.6.recipe
index f64d351cd..fa24f4a3d 100644
--- a/dev-cpp/mxml/mxml-2.6.recipe
+++ b/dev-libs/mini-xml/mini_xml-2.6.recipe
@@ -5,41 +5,44 @@ requiring large non-standard libraries."
 HOMEPAGE="http://www.minixml.org/index.php"
 COPYRIGHT="2003-2014 Michael R Sweet"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://www.msweet.org/files/project3/mxml-$portVersion.tar.gz"
 CHECKSUM_SHA256="b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795"
-PATCHES="mxml-$portVersion.patch"
+SOURCE_DIR="mxml-$portVersion"
+PATCHES="mini_xml-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2"
-SECONDARY_ARCHITECTURES=""
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	mxml$secondaryArchSuffix = $portVersion
+	mini_xml$secondaryArchSuffix = $portVersion
+	cmd:mxmldoc
 	lib:mxml$secondaryArchSuffix = 1.4 compat >= 1
+	lib:libmxml$secondaryArchSuffix = 1.4 compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	mxml${secondaryArchSuffix}_devel = $portVersion
+	mini_xml${secondaryArchSuffix}_devel = $portVersion
 	devel:mxml$secondaryArchSuffix = 1.4 compat >= 1
+	devel:libmxml$secondaryArchSuffix = 1.4 compat >= 1
 	"
 REQUIRES_devel="
-	mxml$secondaryArchSuffix == $portVersion base
+	mini_xml$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:libtoolize
-	cmd:make
 	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	cmd:mkdepend
-	cmd:gcc${secondaryArchSuffix}
-	cmd:ld${secondaryArchSuffix}
 	"
 
 BUILD()
@@ -52,9 +55,9 @@ INSTALL()
 {
 	make install
 
+	prepareInstalledDevelLibs libmxml
 	fixPkgconfig
-	prepareInstalledDevelLibs \
-		libmxml
+
 	packageEntries devel \
 		$developDir $dataDir $manDir/man3
 }
diff --git a/dev-cpp/mxml/mxml-2.9.recipe b/dev-libs/mini-xml/mini_xml-2.9.recipe
similarity index 90%
rename from dev-cpp/mxml/mxml-2.9.recipe
rename to dev-libs/mini-xml/mini_xml-2.9.recipe
index f0f9fb938..c9a982166 100644
--- a/dev-cpp/mxml/mxml-2.9.recipe
+++ b/dev-libs/mini-xml/mini_xml-2.9.recipe
@@ -9,17 +9,17 @@ REVISION="2"
 SOURCE_URI="http://www.msweet.org/files/project3/mxml-2.9.tar.gz"
 CHECKSUM_SHA256="cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92"
 SOURCE_DIR="mxml-2.9"
-PATCHES="mxml-2.9.patchset"
+PATCHES="mini_xml-2.9.patchset"
 
 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
 
 PROVIDES="
-	mxml$secondaryArchSuffix = $portVersion
+	mini_xml$secondaryArchSuffix = $portVersion
 	lib:mxml$secondaryArchSuffix = $portVersion
 	"
 #PROVIDES_devel="
-#	mxml${secondaryArchSuffix}_devel >= $portVersion
+#	mini_xml${secondaryArchSuffix}_devel >= $portVersion
 #	devel:mxml$secondaryArchSuffix >= $portVersion
 #	"
 
diff --git a/dev-cpp/mxml/patches/mxml-2.6.patch b/dev-libs/mini-xml/patches/mini_xml-2.6.patch
similarity index 100%
rename from dev-cpp/mxml/patches/mxml-2.6.patch
rename to dev-libs/mini-xml/patches/mini_xml-2.6.patch
diff --git a/dev-cpp/mxml/patches/mxml-2.9.patchset b/dev-libs/mini-xml/patches/mini_xml-2.9.patchset
similarity index 100%
rename from dev-cpp/mxml/patches/mxml-2.9.patchset
rename to dev-libs/mini-xml/patches/mini_xml-2.9.patchset