diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index c2c2496955b..ee2e678274d 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.40 2013/03/02 13:51:30 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2013/03/10 08:11:05 ajacoutot Exp $
 
 COMMENT=	driver for ZjStream wire protocol compatible printers
 
-VERSION=	20130220
+VERSION=	20130306
 DISTNAME=	foo2zjs-${VERSION}
 
 CATEGORIES=	print
@@ -36,6 +36,10 @@ MAKE_FLAGS+=	CUPS_SERVERBIN=`cups-config --serverbin`
 
 NO_REGRESS=	Yes
 
+# remove CVS ID
+post-extract:
+	perl -pi -e "s,^VERSION=.*,VERSION=\'${VERSION}\'," ${WRKSRC}/getweb.in
+
 post-patch:
 	ln -sf ${WRKSRC}/modify-ppd ${WRKDIR}/bin/modify-ppd
 
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index 1ed5b3e317c..3e145ec793a 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foo2zjs-20130220.tar.gz) = ZFzNvjKYJx3SousAUbRGLNG0N00u0tDuJN8XBQSNX0c=
-SIZE (foo2zjs-20130220.tar.gz) = 1646963
+SHA256 (foo2zjs-20130306.tar.gz) = hKwM3eIvRABtEQxkeGBJnWavHPScq0a5zZ6yiZRLG7M=
+SIZE (foo2zjs-20130306.tar.gz) = 1678271
diff --git a/print/foo2zjs/patches/patch-Makefile b/print/foo2zjs/patches/patch-Makefile
index ac969ea81fe..94710743530 100644
--- a/print/foo2zjs/patches/patch-Makefile
+++ b/print/foo2zjs/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
---- Makefile.orig	Thu Feb 21 01:05:38 2013
-+++ Makefile	Fri Mar  1 10:27:02 2013
+$OpenBSD: patch-Makefile,v 1.20 2013/03/10 08:11:05 ajacoutot Exp $
+--- Makefile.orig	Sun Mar  3 18:14:01 2013
++++ Makefile	Sun Mar 10 08:53:41 2013
 @@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
  # No version number yet...
  VERSION=0.0
@@ -13,10 +13,10 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
  SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -31,13 +26,13 @@ SHARELAVA=$(PREFIX)/share/foo2lava
- SHAREQPDL=$(PREFIX)/share/foo2qpdl
+@@ -32,13 +27,13 @@ SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
  SHAREHC=$(PREFIX)/share/foo2hiperc
+ SHAREHBPL=$(PREFIX)/share/foo2hbpl
 -MANDIR=$(PREFIX)/share/man
 +MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
@@ -29,7 +29,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  
  # User ID's
  LPuid=-oroot
-@@ -236,9 +231,9 @@ FILES	=	\
+@@ -242,9 +237,9 @@ FILES	=	\
  		$(NULL)
  
  # CUPS vars
@@ -42,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  
  # hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
  # sihp1000.img sihp1005.img sihp1020.img sihp1018.img
-@@ -285,7 +280,7 @@ endif
+@@ -291,7 +286,7 @@ endif
  
  # Compiler flags
  #CFLAGS +=	-O2 -Wall -Wno-unused-but-set-variable
@@ -51,7 +51,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  #CFLAGS +=	-g
  
  #
-@@ -409,12 +404,6 @@ all-test:
+@@ -418,12 +413,6 @@ all-test:
  	    echo "      ***"; \
  	    exit 1; \
  	fi
@@ -64,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  ifeq ($(UNAME),Darwin)
  	@if ! type gsed >/dev/null 2>&1; then \
  	    echo "      ***"; \
-@@ -573,7 +562,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
+@@ -591,7 +580,7 @@ zjsdecode: zjsdecode.o $(LIBJBG)
  	$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
  
  command2foo2lava-pjl: command2foo2lava-pjl.o
@@ -73,7 +73,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  
  command2foo2lava-pjl.o: command2foo2lava-pjl.c
  	$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
-@@ -581,9 +570,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
+@@ -599,9 +588,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
  #
  # Installation rules
  #
@@ -84,7 +84,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  	    install-man install-doc
  	#
  	# If you use CUPS, then restart the spooler:
-@@ -640,11 +628,6 @@ install-prog:
+@@ -658,11 +646,6 @@ install-prog:
  	$(INSTALL) -d $(SHAREZJS)/
  	$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
  	$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@@ -96,7 +96,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  
  install-foo:
  	#
-@@ -662,24 +645,14 @@ install-foo:
+@@ -680,24 +663,14 @@ install-foo:
  	#
  	# Install current database files
  	#
@@ -123,7 +123,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
-@@ -808,8 +781,8 @@ install-extra:
+@@ -833,8 +806,8 @@ install-extra:
  	    fi; \
  	done
  
@@ -134,7 +134,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
  MACMODEL=/Library/Printers/PPDs/Contents/Resources
  PPD=$(DESTDIR)/usr/share/ppd
  VARPPD=/var/lp/ppd
-@@ -817,42 +790,8 @@ install-ppd:
+@@ -842,43 +815,8 @@ install-ppd:
  	#
  	# Install PPD files for CUPS
  	#
@@ -157,6 +157,7 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
 -	    find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
 -	    find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
 -	    find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
+-	    find $(PPD) -name '*foo2hbpl*' | xargs rm -rf; \
 -	    [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
 -	    cd PPD; \
 -	    for ppd in *.ppd; do \
@@ -174,12 +175,12 @@ $OpenBSD: patch-Makefile,v 1.19 2013/03/02 13:51:30 ajacoutot Exp $
 -		chmod 664 $(MODEL)/$$ppd.gz; \
 -	    done; \
 -	elif [ -d $(LOCALMODEL) ]; then \
-+	  mkdir -p $(LOCALMODEL)
-+	  if [ -d $(LOCALMODEL) ]; then \
++	mkdir -p $(LOCALMODEL)
++	if [ -d $(LOCALMODEL) ]; then \
  	    rm -f $(LOCALMODEL)/KonicaMinolta*; \
  	    cd PPD; \
  	    for ppd in *.ppd; do \
-@@ -1452,11 +1391,8 @@ install-doc: doc
+@@ -1486,11 +1424,8 @@ install-doc: doc
  	#
  	$(INSTALL) -d -m 755 $(DOCDIR)
  	$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)
diff --git a/print/foo2zjs/patches/patch-getweb_in b/print/foo2zjs/patches/patch-getweb_in
index bd6beed1058..798524f025d 100644
--- a/print/foo2zjs/patches/patch-getweb_in
+++ b/print/foo2zjs/patches/patch-getweb_in
@@ -1,9 +1,9 @@
-$OpenBSD: patch-getweb_in,v 1.12 2013/03/02 13:51:30 ajacoutot Exp $
---- getweb.in.orig	Tue Jan 22 22:34:31 2013
-+++ getweb.in	Fri Mar  1 10:27:02 2013
+$OpenBSD: patch-getweb_in,v 1.13 2013/03/10 08:11:05 ajacoutot Exp $
+--- getweb.in.orig	Sun Mar 10 09:07:33 2013
++++ getweb.in	Sun Mar 10 09:07:33 2013
 @@ -11,7 +11,7 @@
  
- VERSION='$Id: patch-getweb_in,v 1.12 2013/03/02 13:51:30 ajacoutot Exp $'
+ VERSION='20130306'
  
 -WGETOPTS="--passive-ftp -q"
 +WGETOPTS="-V"
diff --git a/print/foo2zjs/pkg/PLIST b/print/foo2zjs/pkg/PLIST
index 38eb0835085..5812ec736f8 100644
--- a/print/foo2zjs/pkg/PLIST
+++ b/print/foo2zjs/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.11 2013/03/02 13:51:30 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.12 2013/03/10 08:11:05 ajacoutot Exp $
 @conflict foomatic-db-<4.0.20091207p1
 @conflict foo2zjs-cup-*
 @pkgpath print/foo2zjs,-cups
 @pkgpath print/foo2zjs,-main
+@extraunexec rm -f %D/share/foo2hbpl/icm/*
 @extraunexec rm -f %D/share/foo2hiperc/icm/*
 @extraunexec rm -f %D/share/foo2hp/icm/*
 @extraunexec rm -f %D/share/foo2lava/icm/*
@@ -14,6 +15,8 @@
 @extraunexec rm -f %D/share/foo2zjs/icm/*
 @bin bin/arm2hpdl
 @bin bin/command2foo2lava-pjl
+@bin bin/foo2hbpl2
+bin/foo2hbpl2-wrapper
 @bin bin/foo2hiperc
 bin/foo2hiperc-wrapper
 @bin bin/foo2hp
@@ -45,6 +48,8 @@ bin/printer-profile
 @bin bin/zjsdecode
 libexec/cups/filter/command2foo2lava-pjl
 @man man/man1/arm2hpdl.1
+@man man/man1/foo2hbpl2-wrapper.1
+@man man/man1/foo2hbpl2.1
 @man man/man1/foo2hiperc-wrapper.1
 @man man/man1/foo2hiperc.1
 @man man/man1/foo2hp.1
@@ -82,6 +87,8 @@ share/doc/foo2zjs/getweb
 share/doc/foo2zjs/manual.pdf
 share/doc/foo2zjs/msexpand
 share/doc/pkg-readmes/${FULLPKGNAME}
+share/foo2hbpl/
+share/foo2hbpl/icm/
 share/foo2hiperc/
 share/foo2hiperc/icm/
 share/foo2hp/
@@ -125,6 +132,8 @@ share/foomatic/db/
 share/foomatic/db/source/
 share/foomatic/db/source/PPD/
 share/foomatic/db/source/PPD/foo2zjs/
+share/foomatic/db/source/PPD/foo2zjs/Dell-1355.ppd.gz
+share/foomatic/db/source/PPD/foo2zjs/Fuji_Xerox-DocuPrint_CM205.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/Generic-OAKT_Printer.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/Generic-ZjStream_Printer.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/HP-Color_LaserJet_1500.ppd.gz
@@ -201,7 +210,9 @@ share/foomatic/db/source/PPD/foo2zjs/Samsung-CLX-3185.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6110.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6115MFP.ppd.gz
 share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6121MFP.ppd.gz
+share/foomatic/db/source/PPD/foo2zjs/Xerox-WorkCentre_6015.ppd.gz
 share/foomatic/db/source/driver/
+share/foomatic/db/source/driver/foo2hbpl2.xml
 share/foomatic/db/source/driver/foo2hiperc.xml
 share/foomatic/db/source/driver/foo2hp.xml
 share/foomatic/db/source/driver/foo2lava.xml
@@ -215,6 +226,10 @@ share/foomatic/db/source/driver/foo2zjs-z2.xml
 share/foomatic/db/source/driver/foo2zjs-z3.xml
 share/foomatic/db/source/driver/foo2zjs.xml
 share/foomatic/db/source/opt/
+share/foomatic/db/source/opt/foo2hbpl2-ColorMode.xml
+share/foomatic/db/source/opt/foo2hbpl2-ICM.xml
+share/foomatic/db/source/opt/foo2hbpl2-MediaType.xml
+share/foomatic/db/source/opt/foo2hbpl2-PageSize.xml
 share/foomatic/db/source/opt/foo2hiperc-ColorMode.xml
 share/foomatic/db/source/opt/foo2hiperc-Compression.xml
 share/foomatic/db/source/opt/foo2hiperc-Duplex.xml
@@ -289,6 +304,8 @@ share/foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
 share/foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
 share/foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
 share/foomatic/db/source/printer/
+share/foomatic/db/source/printer/Dell-1355.xml
+share/foomatic/db/source/printer/Fuji_Xerox-DocuPrint_CM205.xml
 share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
 share/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
@@ -365,3 +382,4 @@ share/foomatic/db/source/printer/Samsung-CLX-3185.xml
 share/foomatic/db/source/printer/Xerox-Phaser_6110.xml
 share/foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
 share/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
+share/foomatic/db/source/printer/Xerox-WorkCentre_6015.xml