diff --git a/src/scanner-driver.c b/src/scanner-driver.c
index 9a1ec770..360bbb5b 100644
--- a/src/scanner-driver.c
+++ b/src/scanner-driver.c
@@ -30,7 +30,8 @@
  * externs
  */
 extern int scan_get_wmainfo(char *filename, MP3FILE *pmp3);
-
+extern int scan_get_ogginfo(char *filename, MP3FILE *pmp3);
+extern int scan_get_flacinfo(char *filename, MP3FILE *pmp3);
 
 /* 
  * Typedefs
@@ -46,6 +47,9 @@ typedef struct scannerlist_tag {
  */
 SCANNERLIST scanner_list[] = {
     { "wma",scan_get_wmainfo },
+    { "flac",scan_get_flacinfo },
+    { "fla",scan_get_flacinfo },
+    { "ogg",scan_get_ogginfo },
     { NULL, NULL }
 };
 char *av0;
diff --git a/src/scanner.mk b/src/scanner.mk
index 2b726ac0..89022ab6 100644
--- a/src/scanner.mk
+++ b/src/scanner.mk
@@ -1,6 +1,7 @@
 CC=gcc
-CFLAGS=-g
+CFLAGS := $(CFLAGS) -g
+LDFLAGS := $(LDFLAGS) -logg -lvorbisfile -lFLAC
 
-scanner:	scanner-driver.o restart.o wma.o err.o
-	$(CC) -o scanner scanner-driver.o restart.o wma.o err.o
+scanner:	scanner-driver.o restart.o wma.o err.o flac.o ogg.o
+	$(CC) -o scanner $(LDFLAGS) scanner-driver.o restart.o wma.o err.o flac.o ogg.o