diff --git a/Makefile b/Makefile
index 2b6ae3a..6691248 100644
--- a/Makefile
+++ b/Makefile
@@ -256,8 +256,6 @@ install:
 		data/claudia-launcher \
 		data/carla \
 		data/carla-control \
-		c++/carla-bridge/carla-bridge-* \
-		c++/carla-discovery/carla-discovery-* \
 		c++/jackmeter/cadence-jackmeter \
 		c++/xycontroller/cadence-xycontroller \
 		$(DESTDIR)$(PREFIX)/bin/
@@ -312,7 +310,12 @@ install:
 
 	# Install main code
 	install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
-	install -m 755 c++/carla-backend/*.so $(DESTDIR)$(PREFIX)/lib/carla/
+
+	install -m 755 \
+		c++/carla-backend/*.so \
+		c++/carla-bridge/carla-bridge-* \
+		c++/carla-discovery/carla-discovery-* \
+		$(DESTDIR)$(PREFIX)/lib/carla/
 
 	# Install addtional stuff for Cadence
 	install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
diff --git a/data/carla b/data/carla
index edcb55d..f31e9c1 100755
--- a/data/carla
+++ b/data/carla
@@ -7,4 +7,5 @@ else
 fi
 
 INSTALL_PREFIX="X-PREFIX-X"
+export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
 exec $PYTHON $INSTALL_PREFIX/share/cadence/src/carla.py --with-libprefix="$INSTALL_PREFIX" "$@"