diff --git a/dev-libs/mini-xml/mini_xml-2.6.recipe b/dev-libs/mini-xml/mini_xml-2.6.recipe
index fa24f4a3d..d20fd8427 100644
--- a/dev-libs/mini-xml/mini_xml-2.6.recipe
+++ b/dev-libs/mini-xml/mini_xml-2.6.recipe
@@ -3,22 +3,26 @@ DESCRIPTION="Mini-XML is a small XML parsing library that you can \
 use to read XML and XML-like data files in your application without \
 requiring large non-standard libraries."
 HOMEPAGE="http://www.minixml.org/index.php"
-COPYRIGHT="2003-2014 Michael R Sweet"
+COPYRIGHT="2003-2009 Michael R Sweet"
 LICENSE="GNU LGPL v2"
-REVISION="1"
-SOURCE_URI="http://www.msweet.org/files/project3/mxml-$portVersion.tar.gz"
-CHECKSUM_SHA256="b0d347da1a0d5a8c9e82f66087d55cfe499728dacae563740d7e733648c69795"
-SOURCE_DIR="mxml-$portVersion"
+REVISION="2"
+SOURCE_URI="https://github.com/michaelrsweet/mxml/archive/release-$portVersion.tar.gz"
+CHECKSUM_SHA256="91d13f51d33dbd17360cc51ce69cf046a7ff7ff256195064c092dc4dbd95810a"
+SOURCE_FILENAME="mxml-$portVersion.tar.gz"
+SOURCE_DIR="mxml-release-$portVersion"
 PATCHES="mini_xml-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="1.4"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
 PROVIDES="
 	mini_xml$secondaryArchSuffix = $portVersion
-	cmd:mxmldoc
-	lib:mxml$secondaryArchSuffix = 1.4 compat >= 1
-	lib:libmxml$secondaryArchSuffix = 1.4 compat >= 1
+	cmd:mxmldoc$secondaryArchSuffix
+	lib:mxml$secondaryArchSuffix = $libVersionCompat
+	lib:libmxml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -26,8 +30,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	mini_xml${secondaryArchSuffix}_devel = $portVersion
-	devel:mxml$secondaryArchSuffix = 1.4 compat >= 1
-	devel:libmxml$secondaryArchSuffix = 1.4 compat >= 1
+	devel:mxml$secondaryArchSuffix = $libVersionCompat
+	devel:libmxml$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	mini_xml$secondaryArchSuffix == $portVersion base
@@ -37,14 +41,14 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:mkdepend
 	"
 
+defineDebugInfoPackage mini_xml$secondaryArchSuffix \
+	"$libDir"/libmxml.so.$libVersion
+
 BUILD()
 {
 	runConfigure ./configure --enable-shared
@@ -55,9 +59,11 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libmxml
+	prepareInstalledDevelLib libmxml
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir $dataDir $manDir/man3
+		$developDir \
+		$dataDir \
+		$manDir/man3
 }
diff --git a/dev-libs/mini-xml/patches/mini_xml-2.6.patch b/dev-libs/mini-xml/patches/mini_xml-2.6.patch
index b886bdcf3..e52156c2d 100644
--- a/dev-libs/mini-xml/patches/mini_xml-2.6.patch
+++ b/dev-libs/mini-xml/patches/mini_xml-2.6.patch
@@ -20,10 +20,10 @@ diff -urN mxml-2.6-orig/configure mxml-2.6/configure
          		# BSD, Darwin (MacOS X), and Linux
          		mandir="/usr/share/man"
          		;;
-+        	BeOS* | Haiku*)
-+        		# BeOS, Haiku
-+        		mandir="/boot/common/share/man"
-+        		;;
++			BeOS* | Haiku*)
++				# BeOS, Haiku
++				mandir="/boot/common/share/man"
++				;;
          	IRIX*)
          		# SGI IRIX
          		mandir="/usr/share/catman/u_man"