diff --git a/lang/erlang/21/Makefile b/lang/erlang/21/Makefile
index 70903389cc2..548e88ffd56 100644
--- a/lang/erlang/21/Makefile
+++ b/lang/erlang/21/Makefile
@@ -6,14 +6,15 @@ COMMENT-wx=	WxWidgets bindings for Erlang
 PORTROACH=	limit:^OTP-21\.
 
 V=		21.3.8.24
-REVISION-main=	1
-REVISION-wx=	0
 DISTNAME=	otp_src_$V
 PKGNAME=	erlang-$V
 PKGNAME-main=	erlang-$V
 PKGNAME-wx=	erlang-wx-$V
 EPOCH=		0
 
+REVISION-main=	2
+REVISION-wx=	1
+
 VERSION_SPEC=	>=21v0,<22v0
 PKGSPEC-main=	erlang-${VERSION_SPEC}
 PKGSPEC-wx=	erlang-wx-${VERSION_SPEC}
diff --git a/lang/erlang/21/pkg/PLIST-main b/lang/erlang/21/pkg/PLIST-main
index 453c1d9980b..037016cb994 100644
--- a/lang/erlang/21/pkg/PLIST-main
+++ b/lang/erlang/21/pkg/PLIST-main
@@ -1,5 +1,6 @@
 @option no-default-conflict
 @pkgpath lang/erlang/21
+@conflict erlang-wx->=21v0,<=21.3.8.24p0v0
 bin/ct_run21
 bin/dialyzer21
 bin/epmd21
@@ -2183,6 +2184,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dbg.beam
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dyntrace.beam
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/erts_alloc_config.beam
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/msacc.beam
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.app
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.appup
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.beam
@@ -2214,6 +2216,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe-n.systemtap
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.d
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.systemtap
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/
 @so lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/dyntrace.so
@@ -2224,6 +2227,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/appmon_info.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/dbg.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/dyntrace.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/erts_alloc_config.erl
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/observer_backend.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/msacc.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/runtime_tools.erl
 lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/runtime_tools_sup.erl
diff --git a/lang/erlang/21/pkg/PLIST-wx b/lang/erlang/21/pkg/PLIST-wx
index 91bba456a33..a4414a251e6 100644
--- a/lang/erlang/21/pkg/PLIST-wx
+++ b/lang/erlang/21/pkg/PLIST-wx
@@ -169,9 +169,6 @@ lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/observer_tv_wx.erl
 lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/observer_wx.erl
 lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/ttb.erl
 lib/${ERLANG_V}/lib/${ERL_OBSERVER}/src/ttb_et.erl
-lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
-lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
-lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/src/observer_backend.erl
 lib/${ERLANG_V}/lib/${ERL_WX}/
 lib/${ERLANG_V}/lib/${ERL_WX}/ebin/
 lib/${ERLANG_V}/lib/${ERL_WX}/ebin/gl.beam