diff --git a/misc/openbabel/Makefile b/misc/openbabel/Makefile
index a67d281e01d..b7d6a551e71 100644
--- a/misc/openbabel/Makefile
+++ b/misc/openbabel/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/01/22 16:32:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2007/04/08 10:10:23 ajacoutot Exp $
 
 COMMENT=	"chemistry file translation program"
 
-V=		2.1.0b4
+V=		2.1.0
 DISTNAME=	openbabel-${V}
 CATEGORIES=	misc
 
diff --git a/misc/openbabel/distinfo b/misc/openbabel/distinfo
index f83a55fdb59..a5042137cf0 100644
--- a/misc/openbabel/distinfo
+++ b/misc/openbabel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openbabel-2.1.0b4.tar.gz) = wqxWXXcgb5A/4EsRlxejRQ==
-RMD160 (openbabel-2.1.0b4.tar.gz) = b+SWjB9AdPXr++Cr5cEokA6b0yk=
-SHA1 (openbabel-2.1.0b4.tar.gz) = dHohEo5TlewBcuSurkdGu4KxFaE=
-SHA256 (openbabel-2.1.0b4.tar.gz) = ZOSz2mpPgz+Kw+BCtHqmb70LCKqsrLmK7vHGY/3ggUo=
-SIZE (openbabel-2.1.0b4.tar.gz) = 6145704
+MD5 (openbabel-2.1.0.tar.gz) = CiJ9M2qB8+YoVNJazFYldw==
+RMD160 (openbabel-2.1.0.tar.gz) = wJb3HxEML7zUwPETr7aPRtCBgBE=
+SHA1 (openbabel-2.1.0.tar.gz) = XyYURCCRy+eRpD3ZZ4hZNXSaNAY=
+SHA256 (openbabel-2.1.0.tar.gz) = PM47rQmQxZIh97JfFZCW9pyHQpcl1HlnN0ijb1L6nac=
+SIZE (openbabel-2.1.0.tar.gz) = 6559619
diff --git a/misc/openbabel/pkg/PFRAG.shared b/misc/openbabel/pkg/PFRAG.shared
index db968350611..839ca2539b9 100644
--- a/misc/openbabel/pkg/PFRAG.shared
+++ b/misc/openbabel/pkg/PFRAG.shared
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/01/22 16:32:41 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2007/04/08 10:10:23 ajacoutot Exp $
 @lib lib/libinchi.so.${LIBinchi_VERSION}
 @lib lib/libopenbabel.so.${LIBopenbabel_VERSION}
 lib/openbabel/APIInterface.so
 lib/openbabel/CSRformat.so
 lib/openbabel/PQSformat.so
+lib/openbabel/acrformat.so
 lib/openbabel/alchemyformat.so
 lib/openbabel/amberformat.so
 lib/openbabel/balstformat.so
@@ -11,8 +12,10 @@ lib/openbabel/bgfformat.so
 lib/openbabel/boxformat.so
 lib/openbabel/cacaoformat.so
 lib/openbabel/cacheformat.so
+lib/openbabel/cansmilesformat.so
 lib/openbabel/carformat.so
 lib/openbabel/cccformat.so
+lib/openbabel/cdxmlformat.so
 lib/openbabel/chem3dformat.so
 lib/openbabel/chemdrawcdxformat.so
 lib/openbabel/chemdrawctformat.so
@@ -26,6 +29,7 @@ lib/openbabel/cssrformat.so
 lib/openbabel/dmolformat.so
 lib/openbabel/fastaformat.so
 lib/openbabel/fastsearchformat.so
+lib/openbabel/fchkformat.so
 lib/openbabel/featformat.so
 lib/openbabel/fhformat.so
 lib/openbabel/fingerprintformat.so
diff --git a/misc/openbabel/pkg/PLIST b/misc/openbabel/pkg/PLIST
index b17a826fe68..0aefd222b01 100644
--- a/misc/openbabel/pkg/PLIST
+++ b/misc/openbabel/pkg/PLIST
@@ -1,17 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/01/22 16:32:41 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/04/08 10:10:23 ajacoutot Exp $
 %%SHARED%%
 bin/babel
 bin/obchiral
+bin/obenergy
 bin/obfit
-bin/obgen
 bin/obgrep
+bin/obminimize
 bin/obprop
 bin/obrotamer
 bin/obrotate
-bin/obxyz
 bin/roundtrip
-include/inchi/
-include/inchi/inchi_api.h
 include/openbabel-2.0/
 include/openbabel-2.0/openbabel/
 include/openbabel-2.0/openbabel/atom.h
@@ -20,6 +18,7 @@ include/openbabel-2.0/openbabel/base.h
 include/openbabel-2.0/openbabel/bitvec.h
 include/openbabel-2.0/openbabel/bond.h
 include/openbabel-2.0/openbabel/bondtyper.h
+include/openbabel-2.0/openbabel/canon.h
 include/openbabel-2.0/openbabel/chains.h
 include/openbabel-2.0/openbabel/chemdrawcdx.h
 include/openbabel-2.0/openbabel/chiral.h
@@ -29,16 +28,17 @@ include/openbabel-2.0/openbabel/fingerprint.h
 include/openbabel-2.0/openbabel/forcefield.h
 include/openbabel-2.0/openbabel/generic.h
 include/openbabel-2.0/openbabel/grid.h
+include/openbabel-2.0/openbabel/groupcontrib.h
 include/openbabel-2.0/openbabel/inchi_api.h
 include/openbabel-2.0/openbabel/internalcoord.h
 include/openbabel-2.0/openbabel/kinetics.h
+include/openbabel-2.0/openbabel/lineend.h
 include/openbabel-2.0/openbabel/math/
 include/openbabel-2.0/openbabel/math/matrix3x3.h
 include/openbabel-2.0/openbabel/math/vector3.h
 include/openbabel-2.0/openbabel/matrix.h
 include/openbabel-2.0/openbabel/mol.h
 include/openbabel-2.0/openbabel/molchrg.h
-include/openbabel-2.0/openbabel/newlinebuf.h
 include/openbabel-2.0/openbabel/obconversion.h
 include/openbabel-2.0/openbabel/oberror.h
 include/openbabel-2.0/openbabel/obiter.h
@@ -47,6 +47,7 @@ include/openbabel-2.0/openbabel/obutil.h
 include/openbabel-2.0/openbabel/parsmart.h
 include/openbabel-2.0/openbabel/patty.h
 include/openbabel-2.0/openbabel/phmodel.h
+include/openbabel-2.0/openbabel/pluginiter.h
 include/openbabel-2.0/openbabel/rand.h
 include/openbabel-2.0/openbabel/reaction.h
 include/openbabel-2.0/openbabel/residue.h
@@ -66,6 +67,8 @@ lib/openbabel/CSRformat.a
 lib/openbabel/CSRformat.la
 lib/openbabel/PQSformat.a
 lib/openbabel/PQSformat.la
+lib/openbabel/acrformat.a
+lib/openbabel/acrformat.la
 lib/openbabel/alchemyformat.a
 lib/openbabel/alchemyformat.la
 lib/openbabel/amberformat.a
@@ -80,10 +83,14 @@ lib/openbabel/cacaoformat.a
 lib/openbabel/cacaoformat.la
 lib/openbabel/cacheformat.a
 lib/openbabel/cacheformat.la
+lib/openbabel/cansmilesformat.a
+lib/openbabel/cansmilesformat.la
 lib/openbabel/carformat.a
 lib/openbabel/carformat.la
 lib/openbabel/cccformat.a
 lib/openbabel/cccformat.la
+lib/openbabel/cdxmlformat.a
+lib/openbabel/cdxmlformat.la
 lib/openbabel/chem3dformat.a
 lib/openbabel/chem3dformat.la
 lib/openbabel/chemdrawcdxformat.a
@@ -110,6 +117,8 @@ lib/openbabel/fastaformat.a
 lib/openbabel/fastaformat.la
 lib/openbabel/fastsearchformat.a
 lib/openbabel/fastsearchformat.la
+lib/openbabel/fchkformat.a
+lib/openbabel/fchkformat.la
 lib/openbabel/featformat.a
 lib/openbabel/featformat.la
 lib/openbabel/fhformat.a
@@ -203,11 +212,14 @@ share/openbabel/${V}/aromatic.txt
 share/openbabel/${V}/atomtyp.txt
 share/openbabel/${V}/bondtyp.txt
 share/openbabel/${V}/element.txt
+share/openbabel/${V}/ghemical.prm
 share/openbabel/${V}/isotope-small.txt
 share/openbabel/${V}/isotope.txt
-share/openbabel/${V}/mm2.prm
+share/openbabel/${V}/logp.txt
+share/openbabel/${V}/mr.txt
 share/openbabel/${V}/patterns.txt
 share/openbabel/${V}/phmodel.txt
+share/openbabel/${V}/psa.txt
 share/openbabel/${V}/resdata.txt
 share/openbabel/${V}/torlib.txt
 share/openbabel/${V}/types.txt