diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index 2a9dcc81a482..6b5fec5c9ef9 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	17.3
-PORTREVISION=	2
+PORTVERSION=	17.4
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
diff --git a/lang/erlang-runtime17/distinfo b/lang/erlang-runtime17/distinfo
index b0c5c7bb12fe..3d51b92e2eea 100644
--- a/lang/erlang-runtime17/distinfo
+++ b/lang/erlang-runtime17/distinfo
@@ -1,6 +1,6 @@
-SHA256 (erlang/otp_src_17.3.tar.gz) = d4be03eb346016f4ca95d53eb9437ffaa6106762f153620dd98cd7f7733b76e4
-SIZE (erlang/otp_src_17.3.tar.gz) = 67050599
-SHA256 (erlang/otp_doc_man_17.3.tar.gz) = 3fabdac0b0594432fdd8186fa2c74ff49a629a9bcc4174e3bd605a3d4002dab7
-SIZE (erlang/otp_doc_man_17.3.tar.gz) = 1357195
-SHA256 (erlang/otp_doc_html_17.3.tar.gz) = bd8278b34f610d6025549640d4e03d79d2a69d7129ea230c0d71d7e6b231f5b3
-SIZE (erlang/otp_doc_html_17.3.tar.gz) = 33444170
+SHA256 (erlang/otp_src_17.4.tar.gz) = 0d82eda6ae7ac6f0f860093324e540fa514497068ec3b4177800284e8c761f56
+SIZE (erlang/otp_src_17.4.tar.gz) = 67171182
+SHA256 (erlang/otp_doc_man_17.4.tar.gz) = 6c1cdb8e9d367c7b6dc6b20706de9fd0a0f0b7dffd66532663b2a24ed7679a58
+SIZE (erlang/otp_doc_man_17.4.tar.gz) = 1360952
+SHA256 (erlang/otp_doc_html_17.4.tar.gz) = dd42b0104418de18e2247608a337bcd3bb24c59bbc36294deb5fae73ab6c90d6
+SIZE (erlang/otp_doc_html_17.4.tar.gz) = 33483554
diff --git a/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__handshake.erl b/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__handshake.erl
deleted file mode 100644
index d415c9a9c802..000000000000
--- a/lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__handshake.erl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- lib/ssl/src/ssl_handshake.erl.orig
-+++ lib/ssl/src/ssl_handshake.erl
-@@ -1732,6 +1732,9 @@
- 							#ec_point_formats{ec_point_format_list =
- 									      ECPointFormats}});
- 
-+dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), Rest/binary>>, Acc) when Len == 0 ->
-+    dec_hello_extensions(Rest, Acc#hello_extensions{sni = ""}); %% Server may send an empy SNI
-+
- dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
-                 ExtData:Len/binary, Rest/binary>>, Acc) ->
-     <<?UINT16(_), NameList/binary>> = ExtData,
diff --git a/lang/erlang-runtime17/files/patch-lib_ssl_test_ssl__handshake__SUITE.erl b/lang/erlang-runtime17/files/patch-lib_ssl_test_ssl__handshake__SUITE.erl
deleted file mode 100644
index fd34b5e50bba..000000000000
--- a/lang/erlang-runtime17/files/patch-lib_ssl_test_ssl__handshake__SUITE.erl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- lib/ssl/test/ssl_handshake_SUITE.erl.orig
-+++ lib/ssl/test/ssl_handshake_SUITE.erl
-@@ -39,6 +39,7 @@
- 	  decode_unknown_hello_extension_correctly,
- 	  encode_single_hello_sni_extension_correctly,
- 	  decode_single_hello_sni_extension_correctly,
-+	  decode_empty_server_sni_correctly,
- 	  select_proper_tls_1_2_rsa_default_hashsign].
- 
- %%--------------------------------------------------------------------
-@@ -106,6 +107,13 @@
-     Decoded = ssl_handshake:decode_hello_extensions(SNI),
-     Exts = Decoded.
- 
-+decode_empty_server_sni_correctly(_Config) ->
-+    Exts = #hello_extensions{sni = ""},
-+    SNI = <<?UINT16(?SNI_EXT),?UINT16(0)>>,
-+    Decoded = ssl_handshake:decode_hello_extensions(SNI),
-+    Exts = Decoded.
-+
-+
- select_proper_tls_1_2_rsa_default_hashsign(_Config) ->
-     % RFC 5246 section 7.4.1.4.1 tells to use {sha1,rsa} as default signature_algorithm for RSA key exchanges
-     {sha, rsa} = ssl_handshake:select_hashsign_algs(undefined, ?rsaEncryption, {3,3}),