diff --git a/common-algo.c b/common-algo.c
index a8d96698ff9b3372ab86e05ac8e042a95223657f..8076358de3e97a1123266347d8cb3721084723b4 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -246,14 +246,14 @@ static struct dropbear_kex kex_ecdh_nistp521 = {NULL, 0, &ecc_curve_nistp521, &s
 
 algo_type sshkex[] = {
 #ifdef DROPBEAR_ECDH
-#ifdef DROPBEAR_ECC_256
-	{"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL},
+#ifdef DROPBEAR_ECC_521
+	{"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL},
 #endif
 #ifdef DROPBEAR_ECC_384
 	{"ecdh-sha2-nistp384", 0, &kex_ecdh_nistp384, 1, NULL},
 #endif
-#ifdef DROPBEAR_ECC_521
-	{"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL},
+#ifdef DROPBEAR_ECC_256
+	{"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL},
 #endif
 #endif
 	{"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL},
diff --git a/dropbearkey.c b/dropbearkey.c
index eecfbcc10f869b73ec513a14c7acfb936a9a5a78..ba10ea9ad49805d89c8213a89c8bcc15a9279d94 100644
--- a/dropbearkey.c
+++ b/dropbearkey.c
@@ -57,7 +57,7 @@
 
 static void printhelp(char * progname);
 
-#define RSA_DEFAULT_SIZE 1024
+#define RSA_DEFAULT_SIZE 2048
 #define DSS_DEFAULT_SIZE 1024
 
 static void buf_writefile(buffer * buf, const char * filename);
diff --git a/ecdsa.h b/ecdsa.h
index 84e40000f8d64de8378440db65af01f70e3fb28c..316235f59b0ea84da1011fe0146747b97289d2c3 100644
--- a/ecdsa.h
+++ b/ecdsa.h
@@ -7,12 +7,12 @@
 
 #ifdef DROPBEAR_ECDSA
 
-#ifdef DROPBEAR_ECC_256
-#define ECDSA_DEFAULT_SIZE 256
-#elif DROPBEAR_ECC_384
-#define ECDSA_DEFAULT_SIZE 384
-#elif DROPBEAR_ECC_521
+#if defined(DROPBEAR_ECC_521)
 #define ECDSA_DEFAULT_SIZE 521
+#elif defined(DROPBEAR_ECC_384)
+#define ECDSA_DEFAULT_SIZE 384
+#elif defined(DROPBEAR_ECC_256)
+#define ECDSA_DEFAULT_SIZE 256
 #else
 #define ECDSA_DEFAULT_SIZE 0
 #endif