diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 72d0c97b7a1..b8922b291a4 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2009/09/17 17:43:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2009/10/11 14:11:58 ajacoutot Exp $
 
 COMMENT=	implementation of the Freedesktop sound theme spec.
 
-V=		0.17
+V=		0.18
 DISTNAME=	libcanberra-${V}
 
 SHARED_LIBS +=  canberra             1.1      # .2.1
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index ecc6bc1de20..a05071560ed 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,5 +1,5 @@
-MD5 (libcanberra-0.17.tar.gz) = 0fXFlW1l0olWYZfmIL4aLg==
-RMD160 (libcanberra-0.17.tar.gz) = 4UKN+JoXGsdk6nYRE3q3sIABuT0=
-SHA1 (libcanberra-0.17.tar.gz) = TvkuJzW/KNKJI8n+FmMacpsp9L8=
-SHA256 (libcanberra-0.17.tar.gz) = X0H6PMmSchcJ03YWAdzZ1X5Owm8RPhFQBf63qrmSAlc=
-SIZE (libcanberra-0.17.tar.gz) = 458025
+MD5 (libcanberra-0.18.tar.gz) = OV6D9+rEizzoNypxQCbIXQ==
+RMD160 (libcanberra-0.18.tar.gz) = qv94o59WveA7zb91asGrCioIooE=
+SHA1 (libcanberra-0.18.tar.gz) = 7TFXp/qI6YD9MiSM+2Zf3PmIAFw=
+SHA256 (libcanberra-0.18.tar.gz) = 0eqF8U/2eHycnekOy/Gc5DRpvYEL0zfin6X7dDxRw4U=
+SIZE (libcanberra-0.18.tar.gz) = 461566
diff --git a/audio/libcanberra/patches/patch-configure_ac b/audio/libcanberra/patches/patch-configure_ac
index 61f442b0c74..4cccb39b3ef 100644
--- a/audio/libcanberra/patches/patch-configure_ac
+++ b/audio/libcanberra/patches/patch-configure_ac
@@ -1,8 +1,8 @@
-$OpenBSD: patch-configure_ac,v 1.4 2009/09/17 17:43:43 ajacoutot Exp $
---- configure.ac.orig	Sat Sep 12 00:04:45 2009
-+++ configure.ac	Thu Sep 17 18:48:39 2009
+$OpenBSD: patch-configure_ac,v 1.5 2009/10/11 14:11:58 ajacoutot Exp $
+--- configure.ac.orig	Sat Sep 19 05:05:11 2009
++++ configure.ac	Sun Oct 11 15:58:13 2009
 @@ -23,14 +23,14 @@ m4_define([ca_major],[0])
- m4_define([ca_minor],[17])
+ m4_define([ca_minor],[18])
  m4_define([ca_version],[ca_major.ca_minor])
  
 -AC_PREREQ(2.63)
diff --git a/audio/libcanberra/patches/patch-src_Makefile_am b/audio/libcanberra/patches/patch-src_Makefile_am
index c966b90f05d..12ee0f768ff 100644
--- a/audio/libcanberra/patches/patch-src_Makefile_am
+++ b/audio/libcanberra/patches/patch-src_Makefile_am
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_am,v 1.3 2009/09/17 17:43:43 ajacoutot Exp $
---- src/Makefile.am.orig	Sat Sep 12 00:13:41 2009
-+++ src/Makefile.am	Thu Sep 17 18:48:39 2009
-@@ -208,6 +208,36 @@ libcanberra_oss_la_LDFLAGS = \
+$OpenBSD: patch-src_Makefile_am,v 1.4 2009/10/11 14:11:58 ajacoutot Exp $
+--- src/Makefile.am.orig	Sun Sep 20 19:49:26 2009
++++ src/Makefile.am	Sun Oct 11 15:58:13 2009
+@@ -209,6 +209,36 @@ libcanberra_oss_la_LDFLAGS = \
  endif
  endif
  
diff --git a/audio/libcanberra/pkg/PLIST b/audio/libcanberra/pkg/PLIST
index 6e29138504a..986a540c953 100644
--- a/audio/libcanberra/pkg/PLIST
+++ b/audio/libcanberra/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/09/17 17:43:43 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2009/10/11 14:11:58 ajacoutot Exp $
 %%SHARED%%
 @bin bin/canberra-gtk-play
 include/canberra-gtk.h
@@ -46,11 +46,11 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2
 share/gtk-doc/html/libcanberra/right.png
 share/gtk-doc/html/libcanberra/style.css
 share/gtk-doc/html/libcanberra/up.png
-share/vala/
-share/vala/vapi/
-share/vala/vapi/libcanberra-gtk.vapi
-share/vala/vapi/libcanberra.vapi
 @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 ${SCHEMAS_INSTDIR}/
 ${SCHEMAS_INSTDIR}/libcanberra.schemas
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+share/vala/
+share/vala/vapi/
+share/vala/vapi/libcanberra-gtk.vapi
+share/vala/vapi/libcanberra.vapi