diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 72f0e81e67e2cbde9b81b957b89ec82efb097d92..36adaf09c755157d5e9784b79b8a84e488c294a3 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1152,6 +1152,8 @@ int main(int argc, char **argv) {
         exit(EXIT_FAILURE);
     }
 
+    virUpdateSelfLastChanged(argv[0]);
+
     if (strstr(argv[0], "lt-libvirtd") ||
         strstr(argv[0], "/daemon/.libs/libvirtd")) {
         char *tmp = strrchr(argv[0], '/');
diff --git a/src/driver.c b/src/driver.c
index ab2a2538a0a69c4cc714b8f1e0e0af2ce73b9c09..721cbeb9f529bce02b2d279b2c90ff41e24652c8 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -74,6 +74,8 @@ virDriverLoadModule(const char *name)
         goto cleanup;
     }
 
+    virUpdateSelfLastChanged(modfile);
+
     handle = dlopen(modfile, RTLD_NOW | RTLD_GLOBAL);
     if (!handle) {
         VIR_ERROR(_("failed to load module %s %s"), modfile, dlerror());
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 00e3d9cd2332bdf6ab884e3df9f8687c7c4397c3..f1607cd6acdae253750a1395cb066e950d6d4759 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1954,6 +1954,7 @@ virGetGroupID;
 virGetGroupList;
 virGetGroupName;
 virGetHostname;
+virGetSelfLastChanged;
 virGetUnprivSGIOSysfsPath;
 virGetUserCacheDirectory;
 virGetUserConfigDirectory;
@@ -1983,6 +1984,7 @@ virSetNonBlock;
 virSetUIDGID;
 virSetUIDGIDWithCaps;
 virStrIsPrint;
+virUpdateSelfLastChanged;
 virValidateWWN;
 
 
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 7a2fbb0561484463ca26ecdaa11fbf0869cb5bc4..b6106fce2a0d69c6ec61bc9fce12de413effc901 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -2173,3 +2173,26 @@ bool virIsSUID(void)
 {
     return getuid() != geteuid();
 }
+
+
+static time_t selfLastChanged;
+
+time_t virGetSelfLastChanged(void)
+{
+    return selfLastChanged;
+}
+
+
+void virUpdateSelfLastChanged(const char *path)
+{
+    struct stat sb;
+
+    if (stat(path, &sb) < 0)
+        return;
+
+    if (sb.st_ctime > selfLastChanged) {
+        VIR_DEBUG("Setting self last changed to %lld for '%s'",
+                  (long long)sb.st_ctime, path);
+        selfLastChanged = sb.st_ctime;
+    }
+}
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 029265c2c0ca91fbc17438b298a19a1d60ace222..cffe1ede48d04f9574e008006324c150d740f239 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -194,4 +194,8 @@ const char *virGetEnvBlockSUID(const char *name);
 const char *virGetEnvAllowSUID(const char *name);
 bool virIsSUID(void);
 
+
+time_t virGetSelfLastChanged(void);
+void virUpdateSelfLastChanged(const char *path);
+
 #endif /* __VIR_UTIL_H__ */