diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index f03284b8e8e6..3445c3969f09 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -1,55 +1,58 @@
 # New ports collection makefile for: 	larbin
 # Date Created:		26 March 2002
 # Whom:			Hiten Pandya <hiten@uk.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	larbin
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/larbin/
 
 MAINTAINER=	hiten@uk.FreeBSD.org
 
-BROKEN=		"Does not compile"
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
+USE_REINPLACE=	yes
 PATCH_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	CXX=${CXX}
 
 post-patch:
 	@${SED} -e 's,CC=,CC?=,' -e 's,CFLAGS=-O3,CFLAGS+=,' < \
 		${WRKSRC}/adns/Makefile > ${WRKSRC}/adns/Makefile.new
 	@${MV} ${WRKSRC}/adns/Makefile.new ${WRKSRC}/adns/Makefile
+	${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's,CFLAGS:=-O3,CFLAGS+=,g ; s,CXXFLAGS:=-Wall -O3,CXXFLAGS+=,g' \
+		${WRKSRC}/src/larbin.make
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin/
 	@${INSTALL_DATA} ${WRKSRC}/larbin.conf ${PREFIX}/etc/larbin.conf.sample
 	@${MKDIR} ${PREFIX}/share/larbin
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/larbin/
 
 pre-configure: config-message
 
 config-message:
 	@${ECHO} "====================================================================="
 	@${ECHO} ""
 	@${ECHO} "Make sure you have a look at the larbin documentation available at:"
 	@${ECHO} "  http://larbin.sourceforge.net/custom-eng.html."
 	@${ECHO} ""
 	@${ECHO} "====================================================================="
 
 post-install:
 	@${ECHO} "====================================================================="
 	@${ECHO} ""
 	@${ECHO} "You must invoke larbin with the name of the configuration file, e.g:"
 	@${ECHO} "larbin -c config-file"
 	@${ECHO} ""
 	@${ECHO} "Documentation: ${PREFIX}/share/larbin"
 	@${ECHO} "Sample Configuration file: ${PREFIX}/etc/larbin.conf.sample"
 	@${ECHO} ""
 	@${ECHO} "====================================================================="
 
 .include <bsd.port.mk>
diff --git a/www/larbin/distinfo b/www/larbin/distinfo
index 8e9dad6ac0c5..25e8705a132c 100644
--- a/www/larbin/distinfo
+++ b/www/larbin/distinfo
@@ -1 +1 @@
-MD5 (larbin-2.6.1.tar.gz) = cdbb7932dc0e8c0ad6417bff971b93f0
+MD5 (larbin-2.6.2.tar.gz) = c4f0199dbbdb8e69d8d1187518f311c9
diff --git a/www/larbin/files/patch-aa b/www/larbin/files/patch-aa
deleted file mode 100644
index 9476a1b9fd52..000000000000
--- a/www/larbin/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- larbin.make.orig	Mon Mar  4 06:47:28 2002
-+++ larbin.make	Sat Jun  8 21:27:26 2002
-@@ -13,8 +13,7 @@
- ABS-MAIN-OBJ:=$(MAIN-OBJ)
- 
- MAKE:=gmake
--CXX:=g++
--CPPFLAGS:=-Wall -O3 -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR)
-+CPPFLAGS= ${CXXFLAGS} -Wall -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR)
- RM:=rm -f
- 
- first: all
-@@ -37,5 +36,3 @@
- 
- prof-in: CPPFLAGS += -pg -DPROF
- prof-in: redo-in
--
---include .depend