apps/s_client.c | 2 ++
 ssl/t1_ext.c    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index 6f22e6e..2685d60 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1359,9 +1359,11 @@ int s_client_main(int argc, char **argv)
                 goto end;
             }
             break;
+#ifndef OPENSSL_NO_NEXTPROTONEG
         case OPT_NEXTPROTONEG:
             next_proto_neg_in = opt_arg();
             break;
+#endif		
         case OPT_ALPN:
             alpn_in = opt_arg();
             break;
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 7940cfc..2873ad0 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -300,7 +300,9 @@ int SSL_extension_supported(unsigned int ext_type)
     case TLSEXT_TYPE_ec_point_formats:
     case TLSEXT_TYPE_elliptic_curves:
     case TLSEXT_TYPE_heartbeat:
+#ifdef TLSEXT_TYPE_next_proto_neg
     case TLSEXT_TYPE_next_proto_neg:
+#endif	
     case TLSEXT_TYPE_padding:
     case TLSEXT_TYPE_renegotiate:
     case TLSEXT_TYPE_server_name: