diff --git a/sbin/camcontrol/timestamp.c b/sbin/camcontrol/timestamp.c
index 642a15a007f9..5f3adfe8b9b7 100644
--- a/sbin/camcontrol/timestamp.c
+++ b/sbin/camcontrol/timestamp.c
@@ -336,6 +336,11 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
 	int single_arg = 0;
 	int do_utc = 0;
 
+#define	FREE(x)	do {	\
+	free(x);	\
+	x = NULL;	\
+} while(0)
+
 	while ((c = getopt(argc, argv, combinedopt)) != -1) {
 		switch (c) {
 		case 'r': {
@@ -358,6 +363,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
 		}
 		case 'f': {
 			single_arg++;
+			FREE(format_string);
 			format_string = strdup(optarg);
 			if (format_string == NULL) {
 				warn("Error allocating memory for format "
@@ -369,6 +375,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
 		}
 		case 'm': {
 			single_arg++;
+			FREE(format_string);
 			format_string = strdup(MIL);
 			if (format_string == NULL) {
 				warn("Error allocating memory");
@@ -382,6 +389,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
 			break;
 		}
 		case 'T':
+			FREE(timestamp_string);
 			timestamp_string = strdup(optarg);
 			if (timestamp_string == NULL) {
 				warn("Error allocating memory for format "
@@ -395,6 +403,8 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
 		}
 	}
 
+#undef FREE
+
 	if (action == -1) {
 		warnx("Must specify an action, either -r or -s");
 		error = 1;