diff --git a/.gitmodules b/.gitmodules
index 2257b9f1..dd608357 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -245,3 +245,7 @@
 	path = packages/libyang
     url = https://github.com/opensourcerouting/libyang.git
     branch = debian
+[submodule "packages/ipaddrcheck"]
+	path = packages/ipaddrcheck
+	url = https://github.com/vyos/ipaddrcheck.git
+	branch = master
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 13919ede..38dea015 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -234,6 +234,12 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \
     dpkg-buildpackage -uc -us -tc -b && \
     dpkg -i ../libvyosconfig0_*_amd64.deb
 
+# Packages needed for ipaddrcheck
+RUN apt-get update && apt-get install -y \
+      libpcre3-dev \
+      libcidr-dev \
+      check
+
 # Packages needed for hvinfo
 RUN apt-get update && apt-get install -y \
       gnat \
diff --git a/packages/ipaddrcheck b/packages/ipaddrcheck
new file mode 160000
index 00000000..8f0d655c
--- /dev/null
+++ b/packages/ipaddrcheck
@@ -0,0 +1 @@
+Subproject commit 8f0d655cc68995a0ef88dc905dc62db2af23ec90
diff --git a/scripts/build-submodules b/scripts/build-submodules
index a167b6e0..ae0c1c09 100755
--- a/scripts/build-submodules
+++ b/scripts/build-submodules
@@ -260,6 +260,7 @@ for PKG in mdns-repeater \
            rtrlib \
            hvinfo \
            igmpproxy \
+           ipaddrcheck \
            libvyosconfig \
            vyatta-bash \
            vyatta-biosdevname \