diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c
index 888f095ed..c6a2a4353 100644
--- a/lib/env_dpdk/init.c
+++ b/lib/env_dpdk/init.c
@@ -100,6 +100,10 @@ _sprintf_alloc(const char *format, ...)
 	return NULL;
 }
 
+#if RTE_VERSION >= RTE_VERSION_NUM(18, 05, 0, 0)
+const char *eal_get_runtime_dir(void);
+#endif
+
 static void
 spdk_env_unlink_shared_files(void)
 {
@@ -110,10 +114,34 @@ spdk_env_unlink_shared_files(void)
 		fprintf(stderr, "Unable to unlink shared memory file: %s. Error code: %d\n", buffer, errno);
 	}
 
+#if RTE_VERSION < RTE_VERSION_NUM(18, 05, 0, 0)
 	snprintf(buffer, PATH_MAX, "/var/run/.spdk_pid%d_hugepage_info", getpid());
 	if (unlink(buffer)) {
 		fprintf(stderr, "Unable to unlink shared memory file: %s. Error code: %d\n", buffer, errno);
 	}
+#else
+	DIR *dir;
+	struct dirent *d;
+
+	dir = opendir(eal_get_runtime_dir());
+	if (!dir) {
+		fprintf(stderr, "Failed to open DPDK runtime dir: %s (%d)\n", eal_get_runtime_dir(), errno);
+		return;
+	}
+
+	while ((d = readdir(dir)) != NULL) {
+		if (d->d_type != DT_REG) {
+			continue;
+		}
+
+		snprintf(buffer, PATH_MAX, "%s/%s", eal_get_runtime_dir(), d->d_name);
+		if (unlink(buffer)) {
+			fprintf(stderr, "Unable to unlink shared memory file: %s. Error code: %d\n", buffer, errno);
+		}
+	}
+
+	closedir(dir);
+#endif
 }
 
 void