diff --git a/README.txt b/README.txt
index 94c3bc8..82bab09 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,9 @@
 
 * symlink the files you like into /etc/apt/*
 * create-gpgring.sh can create new files for trusted.gpg.d/ from public keys and should be preferred over apt-key add
+
+Key sources:
+
+* https://jenkins-ci.org/debian/jenkins-ci.org.key
+* https://debian.lighttpd.net/jenkins-lighttpd.net.gpg
+* `osc signkey` for OBS projects
diff --git a/refresh-obs-keys.sh b/refresh-obs-keys.sh
new file mode 100755
index 0000000..bdcdbcb
--- /dev/null
+++ b/refresh-obs-keys.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+tmpdir=$(mktemp --tmpdir -d refresh-obs-keys-XXXXXXX)
+trap 'rm -rf "${tmpdir}"' EXIT
+
+self=`readlink -f "$0"`
+basedir=`dirname "${self}"`
+keyringdir="${basedir}/trusted.gpg.d"
+
+cd "${tmpdir}"
+
+obs_get() {
+	local proj="$1"
+	local target="$2"
+
+	echo "Fetching key for ${proj}"
+	osc signkey --notravers "${proj}" > "public.key"
+
+	echo "Converting to keyring"
+	"${basedir}/create-gpgring.sh" -o "keyring.gpg" -- "public.key"
+
+	mv "keyring.gpg" "${target}"
+}
+
+obs_get "home:stbuehler" "${keyringdir}/obs-home-stbuehler.gpg"
+obs_get "server:http" "${keyringdir}/obs-server-http.gpg"
+obs_get "openSUSE:Tools" "${keyringdir}/obs-openSUSE-Tools.gpg"
diff --git a/sources.list.d/jenkins-ci.org.list b/sources.list.d/jenkins-ci.org.list
new file mode 100644
index 0000000..5d28261
--- /dev/null
+++ b/sources.list.d/jenkins-ci.org.list
@@ -0,0 +1 @@
+deb http://pkg.jenkins-ci.org/debian binary/
diff --git a/sources.list.d/lighttpd2-jessie.list b/sources.list.d/lighttpd2-jessie.list
index dacb497..033b227 100644
--- a/sources.list.d/lighttpd2-jessie.list
+++ b/sources.list.d/lighttpd2-jessie.list
@@ -3,8 +3,8 @@
 
 deb http://debian.lighttpd.net/lighttpd2 testing main
 
-## no need for nightly helpers
+## there should be no need for nightly helpers
 ## deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2-nightlies/Debian_7.0 ./
 
 # use helpers from wheezy (7.0) repo
-# deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./
diff --git a/sources.list.d/obs-home-stbuehler-wheezy.list b/sources.list.d/obs-home-stbuehler-wheezy.list
new file mode 100644
index 0000000..dd99a71
--- /dev/null
+++ b/sources.list.d/obs-home-stbuehler-wheezy.list
@@ -0,0 +1 @@
+deb http://download.opensuse.org/repositories/home:/stbuehler/Debian_7.0 ./
diff --git a/sources.list.d/obs-openSUSE-Tools-wheezy.list b/sources.list.d/obs-openSUSE-Tools-wheezy.list
new file mode 100644
index 0000000..707c28b
--- /dev/null
+++ b/sources.list.d/obs-openSUSE-Tools-wheezy.list
@@ -0,0 +1 @@
+deb http://download.opensuse.org/repositories/openSUSE:/Tools/Debian_7.0/ ./
diff --git a/trusted.gpg.d/jenkins-ci.org.gpg b/trusted.gpg.d/jenkins-ci.org.gpg
new file mode 100644
index 0000000..c14e43b
Binary files /dev/null and b/trusted.gpg.d/jenkins-ci.org.gpg differ
diff --git a/trusted.gpg.d/obs-home-stbuehler.gpg b/trusted.gpg.d/obs-home-stbuehler.gpg
index dd80908..d71769c 100644
Binary files a/trusted.gpg.d/obs-home-stbuehler.gpg and b/trusted.gpg.d/obs-home-stbuehler.gpg differ
diff --git a/trusted.gpg.d/obs-openSUSE-Tools.gpg b/trusted.gpg.d/obs-openSUSE-Tools.gpg
new file mode 100644
index 0000000..f0a23b3
Binary files /dev/null and b/trusted.gpg.d/obs-openSUSE-Tools.gpg differ