diff --git a/server.c b/server.c
index 1487d80..169f50a 100644
--- a/server.c
+++ b/server.c
@@ -405,7 +405,7 @@
 #ifdef FIO_BIG_ENDIAN
 	probe.bigendian = 1;
 #endif
-	strcpy((char *) probe.fio_version, fio_version_string);
+	strncpy((char *) probe.fio_version, fio_version_string, sizeof(probe.fio_version));
 
 	probe.os	= FIO_OS;
 	probe.arch	= FIO_ARCH;
diff --git a/server.h b/server.h
index d62eeb0..494a40a 100644
--- a/server.h
+++ b/server.h
@@ -78,7 +78,7 @@
 struct cmd_probe_pdu {
 	uint8_t hostname[64];
 	uint8_t bigendian;
-	uint8_t fio_version[8];
+	uint8_t fio_version[32];
 	uint8_t os;
 	uint8_t arch;
 	uint8_t bpp;