--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,21 @@
 #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
 #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
 CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-	 -I/usr/include/ffmpeg \
-	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
-	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
+	 -I$(STAGING_DIR)/usr/include \
+	 -I$(STAGING_DIR)/usr/include/FLAC \
+	 -I$(STAGING_DIR)/usr/include/libavcodec \
+	 -I$(STAGING_DIR)/usr/include/libavformat \
+	 -I$(STAGING_DIR)/usr/include/libavutil \
+	 -I$(STAGING_DIR)/usr/include/libexif \
+	 -I$(STAGING_DIR)/usr/include/uuid \
+	 -I$(STAGING_DIR)/usr/include/vorbis \
+	 -I$(STAGING_DIR)/usr/lib/libiconv/include \
+	 -I$(STAGING_DIR)/usr/lib/libintl/include
+LDFLAGS = -L$(STAGING_DIR)/usr/lib \
+	  -L$(STAGING_DIR)/usr/lib/libintl/lib \
+	  -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+	  -Wl,-rpath=$(STAGING_DIR)/usr/lib \
+	  -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 #STATIC_LINKING: LDFLAGS = -static
 CC = gcc
 RM = rm -f
@@ -36,7 +48,7 @@
 
 ALLOBJS = $(BASEOBJS) $(LNXOBJS)
 
-LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis
+LIBS = -lintl -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis -luuid
 #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
 
 TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
@@ -58,7 +70,7 @@
 	$(INSTALL) -d $(ETCINSTALLDIR)
 	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
 
-minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
+minidlna:	$(BASEOBJS) $(LNXOBJS)
 	@echo Linking $@
 	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)