diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ff39450..79ecab45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,13 @@ ADD_SUBDIRECTORY(typelib)
 
 add_subdirectory(tools)
 
+# Install an env-hook in etc/orocos/${OROCOS_TARGET}/profile.d
+configure_file(env-hooks/00.typelib.sh.in ${CMAKE_CURRENT_BINARY_DIR}/env-hooks/00.typelib.sh @ONLY)
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/env-hooks/00.typelib.sh
+  DESTINATION etc/orocos/profile.d
+)
+
 # Install an env-hook if catkin is found
 find_package(catkin QUIET)
 if(catkin_FOUND)
diff --git a/env-hooks/00.typelib.sh.in b/env-hooks/00.typelib.sh.in
index 416a9951..12054b0a 100644
--- a/env-hooks/00.typelib.sh.in
+++ b/env-hooks/00.typelib.sh.in
@@ -2,8 +2,4 @@
 
 export TYPELIB_USE_GCCXML=1
 
-if [ `uname -s` = Darwin ]; then
-    export DYLD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib/typelib:$DYLD_LIBRARY_PATH
-else
-    export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib/typelib:$LD_LIBRARY_PATH
-fi
+# Note: LD_LIBRARY_PATH/DYLD_LIBRARY_PATH will be set in 00.utilrb.sh.in.
\ No newline at end of file