diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile
index d3698d574ca3..5758c4edfabf 100644
--- a/textproc/bibutils/Makefile
+++ b/textproc/bibutils/Makefile
@@ -15,6 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	Program set interconverts between various bibliography formats
 
+LICENSE=	GPLv2
+
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
diff --git a/textproc/bibutils/files/patch-Makefile_start b/textproc/bibutils/files/patch-Makefile_start
index b4f57b976a78..9403ddd7000e 100644
--- a/textproc/bibutils/files/patch-Makefile_start
+++ b/textproc/bibutils/files/patch-Makefile_start
@@ -1,6 +1,32 @@
---- ./Makefile_start.orig	2010-04-08 18:31:00.000000000 +0200
-+++ ./Makefile_start	2010-05-15 00:21:58.000000000 +0200
-@@ -34,6 +34,7 @@
+--- ./Makefile_start.orig	2010-10-10 19:42:50.000000000 +0200
++++ ./Makefile_start	2011-07-31 01:06:08.000000000 +0200
+@@ -1,6 +1,6 @@
+ POSTFIX=REPLACE_POSTFIX
+-CC = REPLACE_CC
+-RANLIB=REPLACE_RANLIB
++%%SET_CC%%
++%%SET_RANLIB%%
+ INSTALLDIR=REPLACE_INSTALLDIR
+ LIBINSTALLDIR=REPLACE_LIBINSTALLDIR
+ 
+@@ -12,8 +12,8 @@
+ 	xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean
+ 
+ all : FORCE
+-	cd lib; make -k $(CC) -k $(RANLIB); cd ..
+-	cd bin; make -k $(CC) -k VERSION="$(VERSION)" -k DATE="$(DATE)"; cd ..
++	cd lib; make ; cd ..
++	cd bin; make VERSION="$(VERSION)" DATE="$(DATE)"; cd ..
+ 
+ clean: FORCE
+ 	cd lib     ; make clean ; cd ..
+@@ -31,11 +31,12 @@
+ 	cd bin    ; make test; cd ..
+ 
+ install: all FORCE
+-	cd lib ; make -k LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
++	cd lib ; make LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
+ 	sed 's/VERSION/${VERSION}/g' packageconfig_start > lib/bibutils.pc
  	@for p in ${PROGRAMS}; \
  		do ( cp bin/$$p ${INSTALLDIR}/$$p ); \
  	done
diff --git a/textproc/bibutils/files/patch-bin__Makefile b/textproc/bibutils/files/patch-bin__Makefile
new file mode 100644
index 000000000000..041aa21928e5
--- /dev/null
+++ b/textproc/bibutils/files/patch-bin__Makefile
@@ -0,0 +1,11 @@
+--- ./bin/Makefile.orig	2010-10-10 19:49:05.000000000 +0200
++++ ./bin/Makefile	2011-07-31 01:05:18.000000000 +0200
+@@ -2,7 +2,7 @@
+ # bibutils converters MAKEFILE
+ #
+ 
+-CFLAGS     = -I ../lib
++CFLAGS     += -I ../lib
+ LIBDIR     = -L../lib
+ 
+ TOMODS     = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-bin__Makefile.dynamic b/textproc/bibutils/files/patch-bin__Makefile.dynamic
new file mode 100644
index 000000000000..fafe20bac3d2
--- /dev/null
+++ b/textproc/bibutils/files/patch-bin__Makefile.dynamic
@@ -0,0 +1,11 @@
+--- ./bin/Makefile.dynamic.orig	2010-10-10 19:07:17.000000000 +0200
++++ ./bin/Makefile.dynamic	2011-07-31 01:05:18.000000000 +0200
+@@ -4,7 +4,7 @@
+ # dynamic linkage version
+ #
+ 
+-CFLAGS     = -I ../lib
++CFLAGS     += -I ../lib
+ LDFLAGS    = -L ../lib
+ LDLIBS     = -lbibutils
+ 
diff --git a/textproc/bibutils/files/patch-bin__Makefile.static b/textproc/bibutils/files/patch-bin__Makefile.static
new file mode 100644
index 000000000000..ab69b1a81e23
--- /dev/null
+++ b/textproc/bibutils/files/patch-bin__Makefile.static
@@ -0,0 +1,11 @@
+--- ./bin/Makefile.static.orig	2010-10-08 01:57:09.000000000 +0200
++++ ./bin/Makefile.static	2011-07-31 01:05:18.000000000 +0200
+@@ -2,7 +2,7 @@
+ # bibutils converters MAKEFILE
+ #
+ 
+-CFLAGS     = -I ../lib
++CFLAGS     += -I ../lib
+ LIBDIR     = -L../lib
+ 
+ TOMODS     = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-configure b/textproc/bibutils/files/patch-configure
new file mode 100644
index 000000000000..8de3874cff3d
--- /dev/null
+++ b/textproc/bibutils/files/patch-configure
@@ -0,0 +1,13 @@
+--- ./configure.orig	2010-10-10 19:38:32.000000000 +0200
++++ ./configure	2011-07-31 01:05:18.000000000 +0200
+@@ -153,8 +153,8 @@
+ endif
+ 
+ cat $INPUT_FILE | \
+-sed "s/REPLACE_CC/CC=${CC}/" | \
+-sed "s/REPLACE_RANLIB/RANLIB=${RANLIB}/" | \
++sed "s/%%SET_CC%%/CC?=${CC}/" | \
++sed "s/%%SET_RANLIB%%/RANLIB?=${RANLIB}/" | \
+ sed "s|REPLACE_INSTALLDIR|${INSTALLDIR}|" | \
+ sed "s|REPLACE_LIBINSTALLDIR|${LIBINSTALLDIR}|" | \
+ sed "s/REPLACE_POSTFIX/${POSTFIX}/" > $OUTPUT_FILE
diff --git a/textproc/bibutils/files/patch-lib__Makefile.static b/textproc/bibutils/files/patch-lib__Makefile.static
new file mode 100644
index 000000000000..b37dfc308f13
--- /dev/null
+++ b/textproc/bibutils/files/patch-lib__Makefile.static
@@ -0,0 +1,24 @@
+--- ./lib/Makefile.static.orig	2010-10-08 01:57:00.000000000 +0200
++++ ./lib/Makefile.static	2011-07-31 01:05:18.000000000 +0200
+@@ -1,5 +1,5 @@
+ #CC = gcc -Wall 
+-RANLIB = echo
++#RANLIB = echo
+ 
+ SIMPLE_OBJS   = is_ws.o strsearch.o charsets.o
+ 
+@@ -31,12 +31,10 @@
+ all: libbibcore.a libbibutils.a
+ 
+ libbibcore.a: $(BIBCORE_OBJS)
+-	ar -cr $@ $^
+-	$(RANLIB) $@
++	$(AR) -cr $@ $^
+ 
+ libbibutils.a: $(BIBUTILS_OBJS)
+-	ar -cr $@ $^
+-	$(RANLIB) $@
++	$(AR) -cr $@ $^
+ 
+ clean: 
+ 	/bin/rm -f *.o core