diff --git a/.gittrack b/.gittrack
index ed6c15f..1c0b7e0 100644
--- a/.gittrack
+++ b/.gittrack
@@ -1,5 +1,6 @@
 [git-source-track]
-upstream_commit = c80b0de2c48d5ec18a25084ef93203c4b853f527
+upstream_commit = 025af24523ae12c4502fc67abd02398b49f9fe84
 validation_root = ntcore
 exclude_commits_file = .gittrackexclude
-upstream_root = ../ntcore/src/main/native
+upstream_root = ../allwpilib/ntcore/src/main/native
+
diff --git a/.gittrackexclude b/.gittrackexclude
index 23c4580..8b43053 100644
--- a/.gittrackexclude
+++ b/.gittrackexclude
@@ -3,3 +3,7 @@ aa2de65bad663d3d72e08fddb1c166e01cefa3e8 # llvm::Twine
 3438a173410376277ee85e7befa068be28cf8dcd # wpi::mutex (priority-aware mutex)
 19f7a5f1082148b4241333deb6ffe266a806a775 # wpiformat
 4376c94dc19920eb5a6dd1ca6f8b3a948bd28681 # bump copyright
+7210a8fd289cf74ce5be34977355f3d3948083c9 # prepare allwpilib merge
+f84018af5f71d02e630b2bdad8aa61c08f6f1292 # move llvm to wpi
+7a34f5d17d174beec2fd82dd6a05223e80091a8b # checked malloc
+6729a7d6b1dfd9d23b58f51d3e7e76e5d0bf42aa # wpiformat on merged repo
diff --git a/ntcore/ds_client.py b/ntcore/ds_client.py
index 288390d..ec22e51 100644
--- a/ntcore/ds_client.py
+++ b/ntcore/ds_client.py
@@ -1,4 +1,4 @@
-# validated: 2017-12-09 DV 5ab20bb27c97 cpp/DsClient.cpp cpp/DsClient.h
+# validated: 2018-09-09 DV 2287281066f6 cpp/DsClient.cpp cpp/DsClient.h
 #----------------------------------------------------------------------------
 # Copyright (c) FIRST 2017. All Rights Reserved.
 # Open Source Software - may be modified and shared by FRC teams. The code
diff --git a/ntcore/storage.py b/ntcore/storage.py
index c56a2ad..cbb6d96 100644
--- a/ntcore/storage.py
+++ b/ntcore/storage.py
@@ -1,4 +1,4 @@
-# validated: 2018-02-28 DS fd32350dc68c cpp/Storage.cpp cpp/Storage.h cpp/Storage_load.cpp cpp/Storage_save.cpp
+# validated: 2018-09-09 DV 3025a182ccc0 cpp/Storage.cpp cpp/Storage.h cpp/Storage_load.cpp cpp/Storage_save.cpp
 '''----------------------------------------------------------------------------'''
 ''' Copyright (c) FIRST 2017. All Rights Reserved.                             '''
 ''' Open Source Software - may be modified and shared by FRC teams. The code   '''