diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index dc3fada..ae3e6fa 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,4 +11,5 @@ AUX boost-1.52.0-locale-utf.patch 2062 SHA256 8212150730073ba5b08aa9808afcb45d5c
 AUX boost-1.52.0-tuple.patch 500 SHA256 dbf631c8c412ea12b3d63dd4b515e0d5f1383a13db18e13696bd33dee91645d7 SHA512 ed2790b35058a3bf91b49e5e1b61f1861e2ba8d8ec6f885e85d74d62e2182fd1768099660712a900e29a505fbf568f0235c748cca801ede836f67d2adbc6bcd1 WHIRLPOOL be88916331907ad528983e370619c9e734e122c7a1a0a2fb4a6df30f5ca9567884bfece928cab314ecdb425e6195a1b154a6c15722c6c860946ad356b4a4b502
 AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
 DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
-EBUILD boost-1.53.0.ebuild 10218 SHA256 747e8e919a99cbee09fcbd01ace01490b1411f71833a803777e40303fc221253 SHA512 6a727efd93fcd67ccd23f1461514b222341890fe2ae30d220eac266f9b02c22ea1d6f02752dfe5ddcd20a5d7b19c87cc3a1fd98147b827cbb9efff1adfee5e77 WHIRLPOOL d35172a226cffa1dbde2c78b49f2e3b50f4f087ce26676239124b1bf369493b980d5abc7452cdecc851971130791289680037b3ae0693747f4f1cbc3f9225132
+EBUILD boost-1.53.0.ebuild 10240 SHA256 35ac5fe6e47677c7ba9a8a5d4b59f41f5186851b12d2a61da2c6fd8578ffb179 SHA512 c9f9c88190861ba5f9e7746afe5185fd16ae67519bf38ef8cd3f66e30ba70cc4c9f9ac4ba3c63b83fb8173a1c612366b53540c3b79c86833ba57523e85ddd892 WHIRLPOOL bdd02df4c1c8dbf698a145d68db6d9b6f69d4869e12622342fa50d301635894e04bb430f668936628e34089717db8daa616d323a1c331c33b1e181ff416b0b20
+MISC metadata.xml 1220 SHA256 12442e258455aa70d08879028a9bb0424d6a5ceea321984009ae7dd51af10c50 SHA512 163fa62be2cad395e8f9bb7779d105bd02be0e09ba4571c41accf707ec25b9ad0d15a62db90c2cc01660b3759235493c00d96f9b741a93fe857c4bea15ac52b9 WHIRLPOOL ae70da326b7b36689ee9a7f3c29921e9e4d85fd7f8b7863866ff9aa7a86eae2983fb12e23f7f0a0aac35a8c09572954ebf67212bb103bed4e15ee2e4ec764ba0
diff --git a/dev-libs/boost/boost-1.53.0.ebuild b/dev-libs/boost/boost-1.53.0.ebuild
index 53d24fb..327b8b4 100644
--- a/dev-libs/boost/boost-1.53.0.ebuild
+++ b/dev-libs/boost/boost-1.53.0.ebuild
@@ -121,7 +121,7 @@ src_configure() {
 	use nls || OPTIONS+=" --without-locale"
 
 	# Set the valid link options when requesting static libs
-	local static_libs
+	local used_static_libs
 	if [[ ${CHOST} == *-mingw* ]]; then
 		# The build currently dies with undefined references to set_tss_data 
 		# if threads are used with shared linking. Suggestions are to add
@@ -130,12 +130,12 @@ src_configure() {
 			die "this ebuild does not currently support shared linking and threads with mingw"
 		fi
 
-		static_libs="static"
+		used_static_libs="static"
 	else
-		static_libs="shared,static"
+		used_static_libs="shared,static"
 	fi
 
-	OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs $static_libs shared) --without-context"
+	OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs ${used_static_libs} shared) --without-context"
 
 	[[ ${CHOST} == *-mingw* ]] && OPTIONS+=" target-os=windows"
 	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
new file mode 100644
index 0000000..9c5d656
--- /dev/null
+++ b/dev-libs/boost/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cpp</herd>
+  <use>
+    <flag name='tools'>
+      Build and install the boost tools (bcp, quickbook, inspect,
+      wave)
+    </flag>
+    <flag name='debug' restrict='&lt;dev-libs/boost-1.50.0-r3'>
+      Build and install debug versions of the Boost libraries. These
+      libraries are not used by default, and should not be used unless
+      you're developing against Boost.
+    </flag>
+    <flag name='debug' restrict='&gt;dev-libs/boost-1.52.0-r2'>
+      Build and install only the debug version of the Boost
+      libraries. Only enable this flag if you're developing against
+      boost.
+    </flag>
+    <flag name='threads'>
+      Build multi-thread-compatible libraries instead of
+      single-threaded only.
+    </flag>
+    <flag name='nls'>
+      Build libboost_locale. This library requires compatible C
+      library interfaces, which might not be provided by uClibc or
+      other embedded libraries.
+    </flag>
+    <flag name='doc'>
+      Install the full API documentation documentation. This takes
+      over 200MB of extra disk space.
+    </flag>
+  </use>
+</pkgmetadata>