diff --git a/graveyard/unmaintained_satellites/libxdg-basedir.sat b/graveyard/unmaintained_satellites/libxdg-basedir.sat
deleted file mode 100644
index 4f05377..0000000
--- a/graveyard/unmaintained_satellites/libxdg-basedir.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-import "compile/configure"
-
-name=libxdg-basedir
-version=1.2.0
-update_url="https://github.com/devnev/$name/releases"
-
-dlextract "https://github.com/devnev/$name/archive/$name-$version.tar.gz" \
-          'bd3bb815c9e27fda9c721b9c0b29ddda'
-dlfile "https://git.archlinux.org/svntogit/community.git/plain/trunk/xdgGetRelativeHome-overflow.patch?h=packages/$name&id=0c117e8e0b8ad642872e29a6b1342e714375db05" \
-       '2a3670ec13357c4e3c8d55f07d1ec699'
-header_end
-
-cd "$name-$name-$version"
-patch -p0 -i ../xdgGetRelativeHome-overflow.patch
-
-autoreconf -fi
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/dunst.sat b/satellites/dunst.sat
similarity index 100%
rename from graveyard/unmaintained_satellites/dunst.sat
rename to satellites/dunst.sat
diff --git a/satellites/libxdg-basedir.sat b/satellites/libxdg-basedir.sat
new file mode 100644
index 0000000..391368d
--- /dev/null
+++ b/satellites/libxdg-basedir.sat
@@ -0,0 +1,27 @@
+import 'compile/configure'
+import 'misc/debian'
+
+name=libxdg-basedir
+orig_version=1.2.0
+version=$orig_version-1
+update_url="http://http.debian.net/debian/pool/main/libx/$name/"
+
+dlextract "https://github.com/devnev/$name/archive/$name-$orig_version.tar.gz" \
+          'bd3bb815c9e27fda9c721b9c0b29ddda'
+download "http://http.debian.net/debian/pool/main/libx/$name/${name}_$version.debian.tar.xz" \
+         'f76241c6490b3089aef5112bade4c6e5'
+header_end
+
+cd "$name-$name-$orig_version"
+extract "${name}_$version.debian.tar.xz"
+misc_debian_patch
+
+autoreconf -fi
+compile_configure -- --disable-static
+
+# Install docs
+mkdir -p "$dir_install/$dir_prefix/$dir_docdir/$name"
+sed -i -e "/^OUTPUT_DIRECTORY/cOUTPUT_DIRECTORY = $(safe_sed "$dir_install/$dir_prefix/$dir_docdir/$name")" debian/doxygen.cfg
+doxygen debian/doxygen.cfg
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/xautolock.sat b/satellites/xautolock.sat
similarity index 100%
rename from graveyard/unmaintained_satellites/xautolock.sat
rename to satellites/xautolock.sat