diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 842e3a5f68a..1d052021f20 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2009/10/15 23:27:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2010/06/28 07:24:30 landry Exp $
 
 COMMENT=		color ascii art library
 
-DISTNAME=		libcaca-0.99.beta16
-PKGNAME=		libcaca-0.99.16
-SHARED_LIBS +=  caca           0.0               # .0.99
+DISTNAME=		libcaca-0.99.beta17
+PKGNAME=		libcaca-0.99.17
+SHARED_LIBS +=  caca           1.0               # .0.99
 CATEGORIES=		graphics
 
 # LGPLv2.1/Do What The Fuck You Want To Public License
@@ -41,7 +41,7 @@ CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+=	--disable-doc \
 			--disable-slang \
 			--disable-ruby \
-			--disable-python \
+			--disable-java \
 			--disable-csharp \
 			--disable-cxx
 
diff --git a/graphics/libcaca/distinfo b/graphics/libcaca/distinfo
index a63c2b420f2..cee193c59f6 100644
--- a/graphics/libcaca/distinfo
+++ b/graphics/libcaca/distinfo
@@ -1,5 +1,5 @@
-MD5 (libcaca-0.99.beta16.tar.gz) = OVO/SoA3R7Y6mfUBJVYxUQ==
-RMD160 (libcaca-0.99.beta16.tar.gz) = /fyat+2yFE8beGIEhtiX1ywc+mY=
-SHA1 (libcaca-0.99.beta16.tar.gz) = iUyKqGustAFU76qOS+l5TODD17k=
-SHA256 (libcaca-0.99.beta16.tar.gz) = ykyTHL7UvE2MvJQtuRp/8P9eCk2uxm6y8nR3mRi2Ssw=
-SIZE (libcaca-0.99.beta16.tar.gz) = 966593
+MD5 (libcaca-0.99.beta17.tar.gz) = eQ1uJreVDhWQn9vrI6fqhw==
+RMD160 (libcaca-0.99.beta17.tar.gz) = hqTYbO1an88O3fvU+GJopo1JvKk=
+SHA1 (libcaca-0.99.beta17.tar.gz) = JM25+33EoBvieHqQCTBPrUGfeds=
+SHA256 (libcaca-0.99.beta17.tar.gz) = Y1Wunjlh6YPvZgV6Iy0l8fui5/phXXWRq6AR14dk8dY=
+SIZE (libcaca-0.99.beta17.tar.gz) = 1110516
diff --git a/graphics/libcaca/patches/patch-Makefile_in b/graphics/libcaca/patches/patch-Makefile_in
index eb2a113ad00..8e265210c59 100644
--- a/graphics/libcaca/patches/patch-Makefile_in
+++ b/graphics/libcaca/patches/patch-Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2009/10/15 23:27:09 jasper Exp $
---- Makefile.in.orig	Fri Oct 16 00:40:07 2009
-+++ Makefile.in	Fri Oct 16 00:40:20 2009
-@@ -236,7 +236,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+$OpenBSD: patch-Makefile_in,v 1.3 2010/06/28 07:24:30 landry Exp $
+--- Makefile.in.orig	Mon Feb  8 14:47:02 2010
++++ Makefile.in	Mon Jun 28 09:20:18 2010
+@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = kernel caca src examples tests tools caca-sharp cxx python ruby doc
-+SUBDIRS = kernel caca src examples tests tools cxx python ruby doc
+ SUBDIRS = kernel caca src examples tools \
+-          cxx caca-sharp python ruby java \
++          cxx ruby \
+           doc test
+ 
  DIST_SUBDIRS = $(SUBDIRS) win32
- EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec libcaca.sln
- AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/graphics/libcaca/patches/patch-caca_Makefile_in b/graphics/libcaca/patches/patch-caca_Makefile_in
index 7c041b0334f..d4585098fa4 100644
--- a/graphics/libcaca/patches/patch-caca_Makefile_in
+++ b/graphics/libcaca/patches/patch-caca_Makefile_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-caca_Makefile_in,v 1.1 2009/10/15 23:27:09 jasper Exp $
---- caca/Makefile.in.orig	Thu Oct 15 23:17:22 2009
-+++ caca/Makefile.in	Fri Oct 16 00:33:30 2009
-@@ -1006,7 +1006,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLT
+$OpenBSD: patch-caca_Makefile_in,v 1.2 2010/06/28 07:24:30 landry Exp $
+--- caca/Makefile.in.orig	Mon Feb  8 14:47:01 2010
++++ caca/Makefile.in	Fri Jun 25 10:58:39 2010
+@@ -1121,7 +1121,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLT
  
  install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(libdir)
--	. libcaca.la; \
+-	. ./libcaca.la || exit 1; \
  	for x in $$library_names; do \
  	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
  	done
diff --git a/graphics/libcaca/pkg/PLIST b/graphics/libcaca/pkg/PLIST
index a7a17f68f1d..6a6db1237b2 100644
--- a/graphics/libcaca/pkg/PLIST
+++ b/graphics/libcaca/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/10/15 23:27:09 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/06/28 07:24:30 landry Exp $
 %%SHARED%%
 bin/caca-config
 @bin bin/cacademo
@@ -9,14 +9,17 @@ bin/caca-config
 @bin bin/img2txt
 include/caca.h
 include/caca0.h
+include/caca_conio.h
 include/caca_types.h
 include/cucul.h
 lib/libcaca.a
 lib/libcaca.la
+lib/libcucul.la
 lib/pkgconfig/
 lib/pkgconfig/caca.pc
 lib/pkgconfig/cucul.pc
 @man man/man1/caca-config.1
+@man man/man1/cacademo.1
 @man man/man1/cacafire.1
 @man man/man1/cacaplay.1
 @man man/man1/cacaserver.1