diff --git a/writeprotect.c b/writeprotect.c
index 8f70a7c..2895d46 100644
--- a/writeprotect.c
+++ b/writeprotect.c
@@ -73,6 +73,8 @@
 	if (ret != FLASHROM_WP_OK)
 		return ret;
 
+	/* Note: WPS bit isn't read here, because it's not part of any range. */
+
 	for (i = 0; i < ARRAY_SIZE(bits->bp); i++) {
 		if (bit_map->bp[i].reg == INVALID_REG)
 			break;
@@ -116,6 +118,8 @@
 	set_reg_bit(reg_values, write_masks, reg_bits->cmp, bits.cmp);
 	set_reg_bit(reg_values, write_masks, reg_bits->srp, bits.srp);
 	set_reg_bit(reg_values, write_masks, reg_bits->srl, bits.srl);
+	/* Note: always setting WPS bit to zero until its fully supported. */
+	set_reg_bit(reg_values, write_masks, reg_bits->wps, 0);
 
 	/* Write each register */
 	for (reg = STATUS1; reg < MAX_REGISTERS; reg++) {
@@ -256,6 +260,8 @@
 	*count = 1 << bit_count;
 	*ranges = calloc(*count, sizeof(struct wp_range_and_bits));
 
+	/* TODO: take WPS bit into account. */
+
 	size_t range_index;
 	for (range_index = 0; range_index < *count; range_index++) {
 		/*