diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 36c6c5f..aacdd85 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -10,4 +10,5 @@ DIST wine_gecko-1.4-x86_64.msi 14980096 RMD160 5613e27d474085c31b53c868ed020445b
 DIST wine_gecko-1.5-x86.msi 15950848 RMD160 691e4e96abf2bd17a6d55f8bb784c40e23b0ff9c SHA1 07b2bc74d03c885bb39124a7641715314cd3ae71 SHA256 2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c
 DIST wine_gecko-1.5-x86_64.msi 16345088 RMD160 e5557156e11ebcc78529c655e5b93081e9bd5b9c SHA1 80a3b36c30bb79a11889879392fdc1fcda9ca165 SHA256 762e80b41e6922849b28299dc5810a28634d484fe73fb7ca52804460588a1730
 EBUILD wine-1.3.35-r9999.ebuild 5692 RMD160 39b2f44b762574a4225a7c570f9ef88120f4e5ad SHA1 62e3f9e1811cf14e366fc2b7519c30ace82035e4 SHA256 0ff7791ff67efdf4ff76da1f57df2b4ae1a950205489e79cdb068fb8aa1dd0f4
-EBUILD wine-1.5.2-r9999.ebuild 6495 RMD160 5c4e59d48d99f0af2c79b59238695ab4009f9577 SHA1 5c1e4a3223caa3d5be57412319ed5233dcfb70ce SHA256 18a469a792e1c8b513c0c3e8eccb8c3c2f232fcf23768c89c37d48740593fcc8
+EBUILD wine-1.5.2-r9999.ebuild 6497 RMD160 b4cff8b5bb6db23002eb12e487da98a4f47555d3 SHA1 5ee94dc8eb29248f26a0a585083a081b0b5423ad SHA256 58525e6de6c4a1d2112d96ced8dedbcb5ceb558f14690cdf9f1ac114f77faa90
+MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
new file mode 100644
index 0000000..a3a8dbe
--- /dev/null
+++ b/app-emulation/wine/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>wine</herd>
+<longdescription>
+Wine is an Open Source implementation of the Windows API on top of X and Unix.
+
+Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
+</longdescription> 
+<use>
+	<flag name='capi'>Enable ISDN support via CAPI</flag>
+	<flag name='custom-cflags'>Bypass strip-flags; use are your own peril</flag>
+	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
+	<flag name='opencl'>Enable OpenCL support</flag>
+	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
+	<flag name='samba'>Add support for NTLM auth. see
+		http://wiki.winehq.org/NtlmAuthSetupGuide and
+		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
+	<flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
+	<flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
+	<flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emulation/wine/wine-1.5.2-r9999.ebuild b/app-emulation/wine/wine-1.5.2-r9999.ebuild
index 6c435dc..9c25e0e 100644
--- a/app-emulation/wine/wine-1.5.2-r9999.ebuild
+++ b/app-emulation/wine/wine-1.5.2-r9999.ebuild
@@ -129,7 +129,7 @@ src_prepare() {
 	# Pinkbyte: fix perfomance problems with vertex buffers
 	epatch "${FILESDIR}"/disable-dynamic-vertex-buffers.patch
 	# Pinkbyte: finally, this should be executed after applying such patches
-	${S}/tools/make_requests
+	"${S}"/tools/make_requests
 	#
 	epatch_user #282735
 	eautoreconf