diff --git a/www/rubygem-merb-core/Makefile b/www/rubygem-merb-core/Makefile
index c05dac674ca6..34af48a3bd34 100644
--- a/www/rubygem-merb-core/Makefile
+++ b/www/rubygem-merb-core/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	merb-core
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -11,6 +11,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Merb. Pocket rocket web framework
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
 		rubygem-erubis>=2.6.2:${PORTSDIR}/www/rubygem-erubis \
@@ -22,7 +23,14 @@ RUN_DEPENDS=	rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+USES=		shebangfix
+SHEBANG_FILES=	spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/bin/erubis \
+		spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/contrib/erubis
 
 PLIST_FILES=	bin/merb
 
+post-patch:
+	@${REINPLACE_CMD} -i '' -e '1s|/.*ruby|${ruby_CMD}|' \
+		${WRKSRC}/spec10/public/core_ext/fixtures/gems/bin/edit_json.rb
+
 .include <bsd.port.mk>