diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index 1b3179c3c9..98fa5d9d24 100644
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -3,10 +3,10 @@
 # Shamelessly stolen from Owen Taylor and Manish Singh
 # thomasvs added check for vorbis_bitrate_addblock which is new in rc3
 
-dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
 dnl
-AC_DEFUN(AM_PATH_VORBIS,
+AC_DEFUN(XIPH_PATH_VORBIS,
 [dnl 
 dnl Get the cflags and libraries
 dnl
@@ -54,7 +54,6 @@ dnl
 #include <stdlib.h>
 #include <string.h>
 #include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
 
 int main ()
 {
@@ -63,7 +62,7 @@ int main ()
     vorbis_info		vi;
 
     vorbis_info_init (&vi);
-    vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
+    vorbis_encode_init (&vi, 2, 44100, -1, 128, -1);
     vorbis_analysis_init (&vd, &vi);
     vorbis_block_init (&vd, &vb);
     /* this function was added in 1.0rc3, so this is what we're testing for */