diff --git a/.stumpwm.d/init.lisp b/.stumpwm.d/init.lisp
index 16f4b50..794b5d8 100644
--- a/.stumpwm.d/init.lisp
+++ b/.stumpwm.d/init.lisp
@@ -20,4 +20,6 @@
 ;; Follow focus on mouse hover
 (setq *mouse-focus-policy* :sloppy)
 
+(when (is-work-machine)
+  (run-shell-command "~/scripts/watch_aggietimed.sh"))
 (run-shell-command "dunst")
diff --git a/.stumpwm.d/modules b/.stumpwm.d/modules
index 6d4584f..19c231b 160000
--- a/.stumpwm.d/modules
+++ b/.stumpwm.d/modules
@@ -1 +1 @@
-Subproject commit 6d4584f01dec0143a169186df1608860d1aa1ef0
+Subproject commit 19c231b2518efe71cb6dade3ad4cf573377902c3
diff --git a/scripts/watch_aggietimed.sh b/scripts/watch_aggietimed.sh
new file mode 100755
index 0000000..5adfb29
--- /dev/null
+++ b/scripts/watch_aggietimed.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+socket=/tmp/aggietimed.sock
+
+while true
+do
+    aggietimed -d --socket-path $socket
+
+    if [ $? -eq 0 ]
+    then
+        break
+    else
+        rm $socket
+        sleep 1
+    fi
+done