diff -Npur vorbis-tools-1.2.0/oggdec/Makefile.in vorbis-tools-1.2.0_th/oggdec/Makefile.in
--- vorbis-tools-1.2.0/oggdec/Makefile.in	2008-03-03 06:47:58.000000000 +0100
+++ vorbis-tools-1.2.0_th/oggdec/Makefile.in	2008-06-18 20:52:37.000000000 +0200
@@ -185,7 +185,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VORBISENC_LIBS = @VORBISENC_LIBS@
-VORBISFILE_LIBS = @VORBISFILE_LIBS@
+VORBISFILE_LIBS = -lvorbisidec
 VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 WOE32DLL = @WOE32DLL@
@@ -249,7 +249,7 @@ top_srcdir = @top_srcdir@
 mans = oggdec.1
 oggdecsources = oggdec.c
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
-oggdec_LDADD = @LIBICONV@ @SHARE_LIBS@ @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
+oggdec_LDADD = @LIBICONV@ @SHARE_LIBS@ -lvorbisidec @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
 oggdec_DEPENDENCIES = @SHARE_LIBS@
 oggdec_SOURCES = $(oggdecsources)
 man_MANS = $(mans)
diff -Npur vorbis-tools-1.2.0/oggdec/oggdec.c vorbis-tools-1.2.0_th/oggdec/oggdec.c
--- vorbis-tools-1.2.0/oggdec/oggdec.c	2008-03-03 06:37:25.000000000 +0100
+++ vorbis-tools-1.2.0_th/oggdec/oggdec.c	2008-06-18 20:57:36.000000000 +0200
@@ -22,7 +22,7 @@
 #include <io.h>
 #endif
 
-#include <vorbis/vorbisfile.h>
+#include <tremor/ivorbisfile.h>
 
 #include "i18n.h"
 
@@ -30,10 +30,7 @@ struct option long_options[] = {
     {"quiet", 0,0,'Q'},
     {"help",0,0,'h'},
     {"version", 0, 0, 'v'},
-    {"bits", 1, 0, 'b'},
-    {"endianness", 1, 0, 'e'},
     {"raw", 0, 0, 'R'},
-    {"sign", 1, 0, 's'},
     {"output", 1, 0, 'o'},
     {NULL,0,0,0}
 };
@@ -47,7 +44,7 @@ unsigned char headbuf[44]; /* The whole 
 char *outfilename = NULL;
 
 static void version (void) {
-    fprintf (stderr, _("oggdec from %s %s\n"), PACKAGE, VERSION);
+    fprintf (stderr, _("oggdec (w/Tremor hack) from %s %s\n"), PACKAGE, VERSION);
 }
 
 static void usage(void)
@@ -60,11 +57,6 @@ static void usage(void)
                     " --quiet, -Q      Quiet mode. No console output.\n"
                     " --help,  -h      Produce this help message.\n"
                     " --version, -v    Print out version number.\n"
-                    " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-                    " --endianness, -e Output endianness for 16 bit output. 0 for\n"
-                    "                  little endian (default), 1 for big endian\n"
-                    " --sign, -s       Sign for output PCM, 0 for unsigned, 1 for\n"
-                    "                  signed (default 1)\n"
                     " --raw, -R        Raw (headerless) output.\n"
                     " --output, -o     Output to given filename. May only be used\n"
                     "                  if there is only one input file, except in\n"
@@ -80,7 +72,7 @@ static void parse_options(int argc, char
     int option_index = 1;
     int ret;
 
-    while((ret = getopt_long(argc, argv, "Qhvb:e:Rs:o:", 
+    while((ret = getopt_long(argc, argv, "QhvR:o:", 
                     long_options, &option_index)) != -1)
     {
         switch(ret)
@@ -96,19 +88,6 @@ static void parse_options(int argc, char
                 version();
                 exit(0);
                 break;
-            case 's':
-                sign = atoi(optarg);
-                break;
-            case 'b':
-                bits = atoi(optarg);
-                if(bits <= 8)
-                    bits = 8;
-                else
-                    bits = 16;
-                break;
-            case 'e':
-                endian = atoi(optarg);
-                break;
             case 'o':
                 outfilename = strdup(optarg);
                 break;
@@ -306,7 +285,7 @@ static int decode_file(FILE *in, FILE *o
         }
     }
 
-    while((ret = ov_read(&vf, buf, buflen, endian, bits/8, sign, &bs)) != 0) {
+    while((ret = ov_read(&vf, buf, buflen, &bs)) != 0) {
         if(bs != 0) {
             vorbis_info *vi = ov_info(&vf, -1);
             if(channels != vi->channels || samplerate != vi->rate) {