diff --git a/pony_spi.c b/pony_spi.c
index 8a0f340f4..f8faeb33a 100644
--- a/pony_spi.c
+++ b/pony_spi.c
@@ -103,6 +103,18 @@ static const struct bitbang_spi_master bitbang_spi_master_pony = {
 	.half_period = 0,
 };
 
+static int pony_spi_shutdown(void *data)
+{
+	/* Shut down serial port communication */
+	int ret = serialport_shutdown(NULL);
+	if (ret)
+		msg_pdbg("Pony SPI shutdown failed.\n");
+	else
+		msg_pdbg("Pony SPI shutdown completed.\n");
+
+	return ret;
+}
+
 int pony_spi_init(void)
 {
 	int i, data_out;
@@ -120,6 +132,11 @@ int pony_spi_init(void)
 			free(arg);
 			return 1;
 		}
+		if (register_shutdown(pony_spi_shutdown, NULL) != 0) {
+			free(arg);
+			serialport_shutdown(NULL);
+			return 1;
+		}
 		have_device++;
 	}
 	free(arg);