diff --git a/README.md b/README.md
index db28c03..6b915e8 100644
--- a/README.md
+++ b/README.md
@@ -46,13 +46,13 @@ way to get going is to do the following:
 To run the daemon use
 
 ```sh
-_build/run
+_build/run _build/src/feedbackd
 ```
 
 To run under gdb use
 
 ``` sh
-FBD_GDB=1 _build/run
+FBD_GDB=1 _build/run _build/src/feedbackd
 ```
 
 You can introspect and get the current theme with
diff --git a/examples/example.py b/examples/example.py
index 6068fc1..dead56a 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -1,6 +1,11 @@
 #!/usr/bin/python3
 #
-# export GI_TYPELIB_PATH=/usr/local/lib/x86_64-linux-gnu/girepository-1.0/
+# depends on GObject introspection data for libfeedback
+#
+# After building from source you can start this example like this:
+#   _build/run examples/example.py
+# Otherwise like this:
+#   GI_TYPELIB_PATH=</somepath/girepository-x.y/> example.py
 
 import gi
 import time
diff --git a/run.in b/run.in
index cfe574c..33b3933 100755
--- a/run.in
+++ b/run.in
@@ -7,6 +7,7 @@ FEEDBACK_THEME=${FEEDBACK_THEME:-"${ABS_SRCDIR}/data/default.json"}
 
 export FEEDBACK_THEME
 export GSETTINGS_SCHEMA_DIR="${ABS_BUILDDIR}/data"
+export GI_TYPELIB_PATH="${ABS_BUILDDIR}/libfeedback:$GI_TYPELIB_PATH"
 
 if [ "${FBD_GDB}" = 1 ]; then
     echo "Running feedbackd under gdb"
@@ -14,4 +15,4 @@ if [ "${FBD_GDB}" = 1 ]; then
 fi
 
 set -x
-exec ${WRAPPER} "${ABS_BUILDDIR}/src/feedbackd" "$@"
+exec ${WRAPPER} "$@"
diff --git a/tests/services/org.sigxcpu.Feedback.service.in b/tests/services/org.sigxcpu.Feedback.service.in
index 43577c3..ed8e451 100644
--- a/tests/services/org.sigxcpu.Feedback.service.in
+++ b/tests/services/org.sigxcpu.Feedback.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.sigxcpu.Feedback
-Exec=@ABS_BUILDDIR@/run
+Exec=@ABS_BUILDDIR@/run @ABS_BUILDDIR@/src/feedbackd