diff --git a/src/Makefile b/src/Makefile
index 2e8990d..a2231cb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,6 +10,9 @@ CFLAGS+=-pedantic -std=c99 -DHAVE_USB=${HAVE_USB}
 USBOBJ=../libusb/error.o ../libusb/usb.o ../libusb/descriptors.o
 USBOBJ+=../libusb/linux.o ## XXX not portable
 
+CFLAGS+=-I../libusb
+LDFLAGS+=-L../libusb
+
 all: ${BIN}
 
 ${BIN}: ${OBJ}
diff --git a/src/dump.c b/src/dump.c
index 345495c..16fe4aa 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -593,7 +593,7 @@ int reverse_extract_pieces(char *dir)
 {
 	char reply;
 
-	if (n900)
+	if (is_n900())
 		return reverse_extract_pieces_n900(dir);
 
 	printf("Device detected: n770/n800/n900\n");