diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15980fb6..1df160d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,18 +16,28 @@ list yields a list of all related PRs for each release.
 ## Added
 
 - Custom Syrlinks FDIR which disabled most of the default FDIR functionality
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/232
 
 ## Changed
 
 - PCDU handler only called once in PST, but can handle multiple messages now
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/221
+  Bugfix: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/235
 - Update rootfs base of Linux, all related OBSW changes
-- Use gpsd version 3.17 now. Includes API changes
 - Add `/usr/local/bin` to PATH. All shell scripts are there now
-- Rename GPS device to `/dev/gps0`
 - Add Syrlinks and TMP devices to Software by default
 
+### GPS
+
+PRs: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/239
+
+- Rename GPS device to `/dev/gps0`
+- Use gpsd version 3.17 now. Includes API changes
+
 ### EM and FM splitup & Build Workflow improvements
 
+PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/238
+
 - Split up `bsp_q7s` in separate EM and FM build with module loading set to different
   default values. The EM object factory is unique which allows building a parallel setup
   with dummy components