diff --git a/.gitmodules b/.gitmodules
index 9b4eb0bb..2bb7019c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,9 @@
 [submodule "aw-client"]
 	path = aw-client
 	url = https://github.com/ActivityWatch/aw-client.git
+[submodule "aw-server"]
+	path = aw-server
+	url = https://github.com/ActivityWatch/aw-server.git
 [submodule "aw-watcher-afk"]
 	path = aw-watcher-afk
 	url = https://github.com/ActivityWatch/aw-watcher-afk.git
diff --git a/Makefile b/Makefile
index aabde5df..61d371b9 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ build:
 #
 	make --directory=aw-core build DEV=$(DEV)
 	make --directory=aw-client build DEV=$(DEV)
+	make --directory=aw-server build DEV=$(DEV)
 	make --directory=aw-watcher-afk build DEV=$(DEV)
 	make --directory=aw-watcher-window build DEV=$(DEV)
 	make --directory=aw-server-rust build
@@ -44,6 +45,8 @@ build:
 #   The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173
 	make --directory=aw-client build DEV=$(DEV)
 	make --directory=aw-core build DEV=$(DEV)
+#	Needed to ensure that the server has the correct version set
+	python3 -c "import aw_server; print(aw_server.__version__)"
 
 
 # Install
@@ -95,6 +98,7 @@ lint:
 		aw-core/aw_transform/ \
 		aw-core/aw_analysis/ \
 		aw-client/aw_client/ \
+		aw-server/aw_server/ \
 		aw-watcher-window/aw_watcher_window/ \
 		aw-watcher-afk/aw_watcher_afk/ \
 		aw-qt/aw_qt/
@@ -113,6 +117,7 @@ uninstall:
 test:
 	make --directory=aw-core test
 	make --directory=aw-client test
+	make --directory=aw-server test
 	make --directory=aw-server-rust test
 	make --directory=aw-qt test
 
@@ -156,6 +161,9 @@ package:
 #
 	make --directory=aw-watcher-window package
 	cp -r aw-watcher-window/dist/aw-watcher-window dist/activitywatch
+#
+	make --directory=aw-server package
+	cp -r aw-server/dist/aw-server dist/activitywatch
 #
 	make --directory=aw-server-rust package
 	cp -r aw-server-rust/target/package/* dist/activitywatch
diff --git a/aw-client b/aw-client
index 2e11d4b5..6846551b 160000
--- a/aw-client
+++ b/aw-client
@@ -1 +1 @@
-Subproject commit 2e11d4b50484cbe53e37a327eb487f487837f90e
+Subproject commit 6846551b0c91ab37b79435a79e5b2a6bc34d3be6
diff --git a/aw-core b/aw-core
index 4f4b4b24..f43bbf47 160000
--- a/aw-core
+++ b/aw-core
@@ -1 +1 @@
-Subproject commit 4f4b4b241d2d9873c85af81be30ad2770d0d1fc0
+Subproject commit f43bbf47d2f192e1d104babff94e2aa8f9f5f226
diff --git a/aw-server b/aw-server
new file mode 160000
index 00000000..47a208ba
--- /dev/null
+++ b/aw-server
@@ -0,0 +1 @@
+Subproject commit 47a208ba513e1e921a7389282757de3455623a36