diff --git a/satellites/wine-gecko.sat b/satellites/wine-gecko.sat
new file mode 100644
index 0000000..cd27dfe
--- /dev/null
+++ b/satellites/wine-gecko.sat
@@ -0,0 +1,21 @@
+# TODO: Build from source
+
+name=wine
+version=2.47
+update_url="http://dl.winehq.org/$name/$name-gecko/"
+update_names="<a href=\"$version/\"><img src=\"/share/theme/icons/folder.png\" alt=\"[DIR]\" />"
+
+dlfile "http://dl.winehq.org/$name/$name-gecko/$version/${name}_gecko-$version-x86.msi" \
+       '5ebc4ec71c92b3db3d84b334a1db385d'
+if [ "$(uname -m)" = 'x86_64' ]; then
+    dlfile "http://dl.winehq.org/$name/$name-gecko/$version/${name}_gecko-$version-x86_64.msi" \
+           'd93ac0d2e6aceafe9113a9918916df45'
+fi
+header_end
+
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/gecko" "${name}_gecko-$version-x86.msi"
+if [ "$(uname -m)" = 'x86_64' ]; then
+    install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/gecko" "${name}_gecko-$version-x86_64.msi"
+fi
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/wine-mono.sat b/satellites/wine-mono.sat
new file mode 100644
index 0000000..adaff57
--- /dev/null
+++ b/satellites/wine-mono.sat
@@ -0,0 +1,14 @@
+# TODO: Build from source
+
+name=wine
+version=4.6.4
+update_url="http://dl.winehq.org/$name/$name-mono/"
+update_names="<a href=\"$version/\"><img src=\"/share/theme/icons/folder.png\" alt=\"[DIR]\" />"
+
+dlfile "http://dl.winehq.org/$name/$name-mono/$version/$name-mono-$version.msi" \
+       'b0760cf51527b70435c3e4d0361a129a'
+header_end
+
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/mono" "$name-mono-$version.msi"
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/wine.sat b/satellites/wine.sat
similarity index 76%
rename from graveyard/unmaintained_satellites/wine.sat
rename to satellites/wine.sat
index ac9a353..52c1a0d 100644
--- a/graveyard/unmaintained_satellites/wine.sat
+++ b/satellites/wine.sat
@@ -1,17 +1,14 @@
-# TODO: Build wine gecko and mono.
-
 import 'compile/configure'
 
 name=wine
-majver=1.9
-version=$majver.24
+version=2.0
 update_url='https://www.winehq.org/'
 update_names="/announce/$version\""
 
 define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit libdir here'
 
-dlextract "http://dl.winehq.org/$name/source/$majver/$name-$version.tar.bz2" \
-          '6c225b7f41f6ce7ca9acf019c45c9258'
+dlextract "http://dl.winehq.org/$name/source/$version/$name-$version.tar.bz2" \
+          'fde8a855080279f74fb2e9ccec926db7'
 header_end
 
 cd "$name-$version"