diff --git a/graveyard/unmaintained_satellites/bam-0.4.sat b/graveyard/unmaintained_satellites/bam-0.4.sat
deleted file mode 100644
index 35aa513..0000000
--- a/graveyard/unmaintained_satellites/bam-0.4.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-# NOTE: This program includes lua 5.1 in it's source code. Due to how it's built, it's hard to link it against the system libs instead.
-
-name=bam
-version=0.4.0
-update_url="https://matricks.github.io/$name/"
-
-dlextract "http://github.com/downloads/matricks/$name/$name-$version.tar.bz2" \
-          'f8b62ad553c3615a725a034df4fb4257'
-header_end
-
-cd "$name-$version"
-
-# Allow for custom cflags
-sed -i -e "s/-rdynamic/& $(safe_sed "$CFLAGS")/" make_unix.sh
-
-./make_unix.sh
-install -Dm755 "$name" "$dir_install/$dir_prefix/$dir_bindir/$name-0.4"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/bam.sat b/graveyard/unmaintained_satellites/bam.sat
index fbf5eb9..474f499 100644
--- a/graveyard/unmaintained_satellites/bam.sat
+++ b/graveyard/unmaintained_satellites/bam.sat
@@ -1,17 +1,13 @@
 name=bam
-version=0.5.0
-update_url="https://github.com/matricks/$name/releases"
+version=0.5.1
+revision=a23a89d580a0408ca330ab42857157e443ec9b6f
+#update_url="https://github.com/matricks/$name/releases" -- Disabled temporarily until new version (0.5.1) is tagged. Development seems stagnant lately though.
 
-dlextract "https://github.com/matricks/$name/archive/v$version.tar.gz" \
-          '08db8dfc32fb817947c39000092a55d4'
+dlextract "https://github.com/matricks/$name/archive/$revision.tar.gz" \
+          '590b81a95a927eff56d4f4c7462eaafd'
 header_end
 
-cd "$name-$version"
-# Fix parallel make
-cat >> Makefile << EOF
-src/internal_base.h: src/tools/txt2c
-src/main.o: src/internal_base.h
-EOF
+cd "$name-$revision"
 
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
diff --git a/graveyard/unmaintained_satellites/teeworlds.sat b/satellites/teeworlds.sat
similarity index 81%
rename from graveyard/unmaintained_satellites/teeworlds.sat
rename to satellites/teeworlds.sat
index 530ad97..2355f0f 100644
--- a/graveyard/unmaintained_satellites/teeworlds.sat
+++ b/satellites/teeworlds.sat
@@ -2,13 +2,22 @@
 
 name=teeworlds
 version=0.6.4
+version_bam=0.4.0
 update_url='https://www.teeworlds.com/?page=downloads'
 
 dlextract "https://downloads.teeworlds.com/$name-$version-src.tar.gz" \
           '9733800c12462ac4d5a5a4f6ea750af0'
+( name=bam version="$version_bam"
+    dlextract "http://github.com/downloads/matricks/$name/$name-$version.tar.bz2" \
+              'f8b62ad553c3615a725a034df4fb4257'
+)
 extrafile "$name.desktop"
 header_end
 
+( cd "bam-$version_bam"
+    sh -v make_unix.sh
+)
+
 cd "$name-$version-src"
 convert other/icons/Teeworlds.ico "$name.png"
 
@@ -18,7 +27,7 @@ sed -i -e "/CONF_RELEASE/arelease_settings.cc.flags:Add('$CFLAGS')\nrelease_sett
 # Fix data path
 sed -i -e "s/\/usr\/share\/$name\/data/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_datadir/$name")/" src/engine/shared/storage.cpp
 
-bam-0.4 $BAMFLAGS game_release
+"../bam-$version_bam/bam" $BAMFLAGS game_release
 
 mkdir -p "$dir_install/$dir_prefix/$dir_datadir/$name"
 cp -a data/* "$dir_install/$dir_prefix/$dir_datadir/$name/"