diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 41c42dfaab9..7d510e68a50 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.26 2007/07/04 05:38:58 steven Exp $
+# $OpenBSD: Makefile,v 1.27 2007/07/05 12:50:58 steven Exp $
 
 COMMENT=	"real-time, concurrent and distributed functional language"
 
 V=		R11B-5
 DISTNAME=	otp_src_${V}
-PKGNAME=	erlang-11b.5
+PKGNAME=	erlang-11b.5p0
 CATEGORIES=	lang
 
 MAINTAINER=	Jon Olsson <jon@abc.se>
@@ -118,6 +118,8 @@ COSTRANSACTIONS=cosTransactions-${COSTRANSACTIONS_VSN}
 
 post-configure:
 	@touch ${WRKSRC}/lib/odbc/SKIP
+	# Make sure stdlib/shell.erl gets rebuilt
+	rm -f ${WRKSRC}/lib/stdlib/ebin/shell.beam
 
 post-install:
 	tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}
diff --git a/lang/erlang/patches/patch-lib_stdlib_src_shell_erl b/lang/erlang/patches/patch-lib_stdlib_src_shell_erl
new file mode 100644
index 00000000000..5ed80cd70d3
--- /dev/null
+++ b/lang/erlang/patches/patch-lib_stdlib_src_shell_erl
@@ -0,0 +1,15 @@
+$OpenBSD: patch-lib_stdlib_src_shell_erl,v 1.1 2007/07/05 12:50:58 steven Exp $
+
+Fixes a bug with parameterized modules as noted here:
+http://thread.gmane.org/gmane.comp.lang.erlang.general/22464
+--- lib/stdlib/src/shell.erl.orig	Mon Jun 11 14:52:44 2007
++++ lib/stdlib/src/shell.erl	Wed Jul  4 14:58:04 2007
+@@ -709,6 +709,8 @@ apply_fun({erlang,garbage_collect}, [], Shell) ->
+     erlang:garbage_collect(Shell),
+     catch erlang:garbage_collect(whereis(user)),
+     erlang:garbage_collect();
++apply_fun({M,F}, As, _Shell) ->                                                                                                  
++    apply(M, F, As);   
+ apply_fun(MForFun, As, _Shell) ->
+     apply(MForFun, As).
+