--- librcc-0.2.9.orig/engines/Makefile.am
+++ librcc-0.2.9/engines/Makefile.am
@@ -6,17 +6,18 @@ if HAVE_RCD
 lib_LTLIBRARIES += librcd_engine.la
 librcd_engine_la_SOURCES = librcd.c
 librcd_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
-librcd_engine_la_LIBADD = @RCD_LIBS@
+librcd_engine_la_LIBADD = ../src/librcc.la @RCD_LIBS@
 endif
 
 if HAVE_LIBGUESS
 lib_LTLIBRARIES += libguess_engine.la
 libguess_engine_la_SOURCES = libguess.c
 libguess_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
-libguess_engine_la_LIBADD = @LIBGUESS_LIBS@
+libguess_engine_la_LIBADD = ../src/librcc.la @LIBGUESS_LIBS@
 endif
 
 western_engine_la_SOURCES = western.c
 western_engine_la_LDFLAGS = -module -avoid-version -export-symbols-regex "rccGetInfo"
+western_engine_la_LIBADD = ../src/librcc.la
 
 AM_CPPFLAGS = -I../src @RCD_INCLUDES@ @LIBGUESS_INCLUDES@
--- librcc-0.2.9.orig/src/librcc.c
+++ librcc-0.2.9/src/librcc.c
@@ -401,8 +401,8 @@ rcc_language_id rccRegisterLanguage(rcc_
     if ((i==1)&&(!language->charsets[1])&&(rccIsUTF8(language->charsets[0])))
 	    ctx->ilang[ctx->n_languages].latin = 1;
 
-    ctx->languages[ctx->n_languages++] = (rcc_language_ptr)(ctx->ilang + ctx->n_languages);
-    ctx->languages[ctx->n_languages] = NULL;
+    ctx->languages[ctx->n_languages] = (rcc_language_ptr)(ctx->ilang + ctx->n_languages);
+    ctx->languages[++ctx->n_languages] = NULL;
     
     if (!ctx->current_language)
 	ctx->current_config = rccGetCurrentConfig(ctx);
@@ -508,8 +508,8 @@ rcc_class_id rccRegisterClass(rcc_contex
     ctx->iclass[ctx->n_classes].disabled = NULL;
     ctx->iclass[ctx->n_classes].additional = NULL;
 
-    ctx->classes[ctx->n_classes++] = (rcc_class_ptr)(ctx->iclass + ctx->n_classes);
-    ctx->classes[ctx->n_classes] = NULL;
+    ctx->classes[ctx->n_classes] = (rcc_class_ptr)(ctx->iclass + ctx->n_classes);
+    ctx->classes[++ctx->n_classes] = NULL;
     
     if (!strcasecmp(cl->name, "id3")) {
 	rccRegisterDisabledCharsets(ctx, ctx->n_classes - 1, rcc_default_disabled_id3_charsets);
--- librcc-0.2.9.orig/src/rccdb4.c
+++ librcc-0.2.9/src/rccdb4.c
@@ -30,9 +30,9 @@
 #define DATABASE "autolearn.db"
 
 db4_context rccDb4CreateContext(const char *dbpath, rcc_db4_flags flags) {
-    int err;
     db4_context ctx;
 #ifdef HAVE_DB_H
+    int err;
     DB_ENV *dbe;
     DB *db;
     
--- librcc-0.2.9.orig/src/rccstring.c
+++ librcc-0.2.9/src/rccstring.c
@@ -64,7 +64,7 @@ int rccStringFixID(rcc_string string, rc
     header = (rcc_string_header*)string;
 
 
-    memcpy(lang, header->language, 2); lang[3] = 0;
+    memcpy(lang, header->language, 2); lang[2] = 0;
     curlang = rccGetLanguageName(ctx, header->language_id);
     if ((curlang)&&(!strcasecmp(lang, curlang))) return 0;
     
--- librcc-0.2.9.orig/ui/Makefile.am
+++ librcc-0.2.9/ui/Makefile.am
@@ -4,7 +4,7 @@ librccui_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     null.c    
-librccui_la_LIBADD = @XML_LIBS@ ../src/librcc.la
+librccui_la_LIBADD = ../src/librcc.la @XML_LIBS@
 librccui_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 
 if HAVE_GTK
@@ -14,7 +14,7 @@ librccgtk_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk_la_LIBADD = @GTK1_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk_la_LIBADD = ../src/librcc.la @GTK1_LIBS@ @XML_LIBS@
 librccgtk_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 librccgtk_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK1_INCLUDES@
 endif
@@ -26,7 +26,7 @@ librccgtk2_la_SOURCES = librccui.c \
     rccnames.c rccnames.h \
     internal.h \
     gtk.c    
-librccgtk2_la_LIBADD = @GTK2_LIBS@ @XML_LIBS@ ../src/librcc.la
+librccgtk2_la_LIBADD = ../src/librcc.la @GTK2_LIBS@ @XML_LIBS@
 librccgtk2_la_LDFLAGS = -version-info @LIBRCC_VERSION_INFO@
 librccgtk2_la_CPPFLAGS = -I../src @XML_INCLUDES@ @GTK2_CFLAGS@
 endif