diff --git a/zdev/src/zdev_id.c b/zdev/src/zdev_id.c
index 9ad99618..2464b166 100644
--- a/zdev/src/zdev_id.c
+++ b/zdev/src/zdev_id.c
@@ -213,9 +213,16 @@ out:
 static void write_zdev_site_id(int site_id)
 {
 	FILE *fd;
-	int rc;
+	int tmpfd, rc;
+	const char zdev_id_file[] = ZDEV_SITE_ID_FILE;
+	char zdev_id_tmpfile[] = ZDEV_SITE_ID_FILE "-XXXXXX";
 
-	fd = fopen(ZDEV_SITE_ID_FILE, "w");
+	tmpfd = mkstemp(zdev_id_tmpfile);
+	if (tmpfd == -1)
+		goto err;
+
+	/* Open the temp file to use with fprintf */
+	fd = fdopen(tmpfd, "w");
 	if (!fd)
 		goto err;
 
@@ -232,6 +239,12 @@ static void write_zdev_site_id(int site_id)
 	if (fclose(fd))
 		goto err;
 
+	/* Rename the temporary file to ZDEV_SITE_ID_FILE*/
+	if (rename(zdev_id_tmpfile, zdev_id_file) == -1) {
+		remove(zdev_id_tmpfile);
+		goto err;
+	}
+
 	return;
 err:
 	err(1, "Could not write to zdev_site_id file");