diff --git a/packages.autobuild b/packages.autobuild
index 265dbce..6e3b323 100644
--- a/packages.autobuild
+++ b/packages.autobuild
@@ -14,6 +14,8 @@ cmake_package "tools/workflow"
 
 cmake_package "tools/config"
 
+cmake_package "tools/stream_aligner"
+
 cmake_package "gui/vizkit3d_taste"
 
 cmake_package "control/ilk-compiler" do |pkg|
diff --git a/source.yml b/source.yml
index 797295b..8fd71d4 100644
--- a/source.yml
+++ b/source.yml
@@ -35,11 +35,15 @@ version_control:
         - tools/workflow:
           github: ESROCOS/tools-workflow
           branch: master
-          
+
         - tools/config:
           github: ESROCOS/tools-config
           branch: master
 
+        - tools/stream_aligner:
+          github: ESROCOS/tools-stream_aligner
+          branch: master
+
         # Fork of gui-robot_model from rock-gui without dependencies not needed in ESROCOS
         - gui/robot_model:
           github: ESROCOS/gui-robot_model
@@ -56,7 +60,7 @@ version_control:
         - control/ilk-generator:
           github: ESROCOS/ilk-generator.git
           branch: dev-autoproj
-          
+
         - tools/libpus:
           github: ESROCOS/tools-libpus
           branch: master