diff --git a/ChangeLog b/ChangeLog
index f31a301760bbb000798c090c16dfd152583e8eeb..081faae37f6f0b67d1bd20931caea29b4b763607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-16  Niels Möller  <nisse@lysator.liu.se>
+
+	* tools/pkcs1-conv.c (convert_file): Add missing break statements.
+
 2018-01-09  Niels Möller  <nisse@lysator.liu.se>
 
 	* testsuite/testutils.c (test_cipher_ctr): Test operations with
diff --git a/tools/pkcs1-conv.c b/tools/pkcs1-conv.c
index efd6528a4ab4401f73a30f48603752723cc5ef32..f6b044d22bc9d7f98fc370e9e13d2f69014e1a27 100644
--- a/tools/pkcs1-conv.c
+++ b/tools/pkcs1-conv.c
@@ -563,28 +563,20 @@ convert_file(struct nettle_buffer *buffer,
 	    {
 	    case 10:
 	      if (memcmp(marker, "PUBLIC KEY", 10) == 0)
-		{
-		  type = GENERAL_PUBLIC_KEY;
-		  break;
-		}
+		type = GENERAL_PUBLIC_KEY;
+	      break;
+
 	    case 14:
 	      if (memcmp(marker, "RSA PUBLIC KEY", 14) == 0)
-		{
-		  type = RSA_PUBLIC_KEY;
-		  break;
-		}
+		type = RSA_PUBLIC_KEY;
+	      break;
 
 	    case 15:
 	      if (memcmp(marker, "RSA PRIVATE KEY", 15) == 0)
-		{
-		  type = RSA_PRIVATE_KEY;
-		  break;
-		}
-	      if (memcmp(marker, "DSA PRIVATE KEY", 15) == 0)
-		{
-		  type = DSA_PRIVATE_KEY;
-		  break;
-		}
+		type = RSA_PRIVATE_KEY;
+	      else if (memcmp(marker, "DSA PRIVATE KEY", 15) == 0)
+		type = DSA_PRIVATE_KEY;
+	      break;
 	    }
 	  
 	  if (!type)