diff --git a/doc/Changelog b/doc/Changelog
index 22ab00b77..e6bdd8bb5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 15 January 2009: Wouter
 	- bug #229: fixup configure checks for compilation with Solaris 
 	  Sun cc compiler, ./configure CC=/opt/SUNWspro/bin/cc
+	- fixup suncc warnings.
 
 14 January 2009: Wouter
 	- 1.2.1 feature: negative caching for failed queries.
diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 69782ce8c..7ec032a72 100644
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -101,10 +101,7 @@ has_additional(uint16_t t)
 		case LDNS_RR_TYPE_NAPTR:
 			/* TODO: NAPTR not supported, glue stripped off */
 			return 0;
-		default:
-			return 0;
 	}
-	/* NOTREACHED */
 	return 0;
 }
 
diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index 73002ae5e..d646ffee8 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -460,14 +460,13 @@ ub_process(struct ub_ctx* ctx)
 		if(r == 0)
 			return UB_PIPE;
 		else if(r == -1)
-			return UB_NOERROR;
+			break;
 		if(!process_answer(ctx, msg, len)) {
 			free(msg);
 			return UB_PIPE;
 		}
 		free(msg);
 	}
-	/* NOTREACHED */
 	return UB_NOERROR;
 }
 
diff --git a/validator/validator.c b/validator/validator.c
index be415d832..a0e952786 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -2182,13 +2182,12 @@ ds_response_to_ke(struct module_qstate* qstate, struct val_qstate* vq,
 	} else {
 		verbose(VERB_QUERY, "Encountered an unhandled type of "
 			"DS response, thus bogus.");
-return_bogus:
-		*ke = key_entry_create_bad(qstate->region, qinfo->qname,
-			qinfo->qname_len, qinfo->qclass);
-		return (*ke) != NULL;
+		goto return_bogus;
 	}
-	/* NOTREACHED */
-	return 0;
+return_bogus:
+	*ke = key_entry_create_bad(qstate->region, qinfo->qname,
+		qinfo->qname_len, qinfo->qclass);
+	return (*ke) != NULL;
 }
 
 /**