diff --git a/Makefile.am b/Makefile.am
index 48734ac5a..84c1e019f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ SDK_EXCLUDED= \
 	$(OPTIONAL_SOUNDS)
 
 
-GTK_PREFIX=/usr
+GTK_PREFIX=/
 GTK_THEME=Outcrop
 GTK_FILELIST=gtk+-2.22.1.filelist
 GTK_FILELIST_PATH=$(shell cd $(top_srcdir) && pwd)/$(GTK_FILELIST)
@@ -109,7 +109,11 @@ other-cherrypick:
 			cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
 		fi \
 	done
-	cp /mingw/bin/libgcc_s*.dll $(INSTALLDIR_WITH_PREFIX)/bin/.
+	cp /mingw/bin/libgcc_s*.dll \
+		/mingw/bin/libstdc++-6.dll \
+		/mingw/bin/libintl-8.dll \
+		/mingw/bin/libiconv-2.dll \
+		$(INSTALLDIR_WITH_PREFIX)/bin/.
 
 
 gtk-cherrypick:
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index de770f850..1cfc61b07 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -1,5 +1,4 @@
 ./bin/avcodec-52.dll
-./bin/avformat-52.dll
 ./bin/avutil-50.dll
 ./bin/libeXosip2-4.dll
 ./bin/libogg.dll
@@ -8,3 +7,4 @@
 ./bin/libosip2-4.dll
 ./bin/libosipparser2-4.dll
 ./bin/swscale-0.dll
+