diff --git a/GIDs b/GIDs
index 18c8f8438f09..98182eefddeb 100644
--- a/GIDs
+++ b/GIDs
@@ -810,7 +810,7 @@ opensearch:*:855:
 # free: 867
 # free: 868
 # free: 869
-# free: 870
+buildbot:*:870
 # free: 871
 bitmark:*:872:
 bitmark-recorder:*:873:
diff --git a/UIDs b/UIDs
index acdac4f39461..8aec0c1580f9 100644
--- a/UIDs
+++ b/UIDs
@@ -815,7 +815,7 @@ opensearch:*:855:855::0:0:opensearch user:/nonexistent:/usr/sbin/nologin
 # free: 867
 # free: 868
 # free: 869
-# free: 870
+buildbot:*:870:870::0:0:Buildbot user:/var/db/buildbot:/usr/sbin/nologin
 archiva:*:871:871::0:0:Apache Archiva Daemon:/nonexistent:/usr/sbin/nologin
 bitmark:*:872:872::0:0:Bitmark Property System:/var/lib/bitmarkd:/usr/sbin/nologin
 bitmark-recorder:*:873:873::0:0:Bitmark Property Recorder:/var/lib/recorderd:/usr/sbin/nologin