diff --git a/beakerlib2tmt.sh b/beakerlib2tmt.sh
new file mode 100755
index 0000000..6c89be3
--- /dev/null
+++ b/beakerlib2tmt.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Extract required packages from beakerlib Makefile
+# and generate them into tmt files
+
+TMPMETA=$(mktemp /tmp/beaker-meta-XXXXX.txt)
+ALLPACKAGES=$(pwd)/allpackages.txt
+
+find -name 'Makefile' | while read MAKEFILE; do
+DIRNAME=$(dirname -- "$MAKEFILE")
+FMF="$DIRNAME/main.fmf"
+if [ -f "$FMF" ] && ! grep -q 'require:' "$FMF"; then
+	rm -f "$TMPMETA"
+	(cd $DIRNAME && make METADATA="$TMPMETA" "$TMPMETA")
+	PACKAGES=$(grep Requires: "$TMPMETA" | cut -d: -f2- | xargs echo)
+	echo 'require:' >> "$FMF"
+	for PKG in $PACKAGES; do
+		echo "    - $PKG" >> "$FMF"
+		echo "$PKG" >> "$ALLPACKAGES"
+	done
+fi
+done
+
+sort -u < "$ALLPACKAGES" > "$TMPMETA"
+mv "$TMPMETA" "$ALLPACKAGES"
diff --git a/purge-rhts.sh b/purge-rhts.sh
old mode 100644
new mode 100755
index 79cd495..5428dd6
--- a/purge-rhts.sh
+++ b/purge-rhts.sh
@@ -4,3 +4,4 @@
 
 find -name Makefile -exec sed -e 's|include /usr/share/rhts/lib/rhts-make.include||' -e 's|rhts-lint $(METADATA)||'  -e 'T' -e 'd' -i '{}' ';'
 find -name runtest.sh -exec sed -e 's|. /usr/bin/rhts-environment.sh||' -e 'T' -e 'd' -i '{}' ';'
+find -name runtest.sh -exec sed -e 's|. /usr/lib/beakerlib/beakerlib.sh|. /usr/share/beakerlib/beakerlib.sh|' -e 'T' -e 'd' -i '{}' ';'