diff --git a/linphone/Makefile.am b/linphone/Makefile.am
index ed8c6d342..8784af9c8 100644
--- a/linphone/Makefile.am
+++ b/linphone/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = config.rpath  BUGS linphone.kdevprj \
 				intltool-merge.in	\
 				intltool-update.in \
 				README.arm \
-				README.win32 \
+				README.mingw \
 				autogen.sh \
 				linphone.spec.in linphone.spec
 ACLOCAL_FLAGS=-I$(top_srcdir)/m4
@@ -58,4 +58,4 @@ zip:
 	cd $(INSTALLDIR)/$(prefix) && rm -rf $(ZIP_EXCLUDED) && \
 	zip -r $(ZIPFILE) *
 
-	
\ No newline at end of file
+	
diff --git a/linphone/README.CVS b/linphone/README.CVS
deleted file mode 100644
index 53b782def..000000000
--- a/linphone/README.CVS
+++ /dev/null
@@ -1,12 +0,0 @@
-In order to compile from CVS, you have to first install:
-- pkg-config
-- intltool (intltool-devel if rpm)
-- install the mandatory and optional dependencies described in README file.
-
-Then:
- ./autogen.sh #to generate the configure script
- ./configure  # with desired options
- make
-
-
-Simon MORLAT < simon dot morlat at linphone dot org >
diff --git a/linphone/README.mingw b/linphone/README.mingw
index a212ed328..ea9fb59b9 100644
--- a/linphone/README.mingw
+++ b/linphone/README.mingw
@@ -38,7 +38,7 @@ make zip
 #build plugins
 cd mediastreamer2/plugins/msx264
 ./autogen.sh
-PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static 
+PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static --enable-hacked-x264
 make
 #make a binary zip of this plugin
 make zip
diff --git a/linphone/coreapi/plugins/buddylookup/Makefile.am b/linphone/coreapi/plugins/buddylookup/Makefile.am
index d41d2ef3e..281d0c4cc 100644
--- a/linphone/coreapi/plugins/buddylookup/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=src
 
 
 
-INSTALLDIR=$(shell cd $(top_builddir) && pwd)/buddylookup-install
+INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install
 ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
 ZIP_EXCLUDED=include 
 
@@ -17,5 +17,5 @@ zip:
 	zip -r $(ZIPFILE) *
 
 clean-local:
-	rm -rf buddylookup-install
+	rm -rf $(PACKAGE)-install
 	rm $(PACKAGE)-win32-$(VERSION).zip
diff --git a/linphone/make_exosip.sh b/linphone/make_exosip.sh
deleted file mode 100755
index bff5fa33f..000000000
--- a/linphone/make_exosip.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#this script pickups eXosip files usefull for linphone and put them into exosip/ .
-if test -z $1 ; then
-	echo "make_exosip.sh <exosip root tree>"
-	exit 1
-fi
-
-exosip_src=$1
-for file in $exosip_src/src/*.c ; do
-	echo "processing $file ..." 
-	sed -e 's/eXosip\/eXosip.h/eXosip.h/' -e 's/eXosip\/eXosip_cfg.h/eXosip_cfg.h/' $file > exosip/`basename $file` 
-done
-for file in $exosip_src/src/*.h ; do
-	echo "processing $file ..." 
-	sed -e 's/eXosip\/eXosip.h/eXosip.h/' -e 's/eXosip\/eXosip_cfg.h/eXosip_cfg.h/' $file > exosip/`basename $file` 
-done
-for file in $exosip_src/include/eXosip/*.h ; do
-	echo "processing $file ..." 
-	sed -e 's/eXosip\/eXosip.h/eXosip.h/' -e 's/eXosip\/eXosip_cfg.h/eXosip_cfg.h/' $file > exosip/`basename $file` 
-done
-
-echo "Finished !"
diff --git a/linphone/mediastreamer2/plugins/msx264/Makefile.am b/linphone/mediastreamer2/plugins/msx264/Makefile.am
index 5cb64b1c7..ce781594e 100644
--- a/linphone/mediastreamer2/plugins/msx264/Makefile.am
+++ b/linphone/mediastreamer2/plugins/msx264/Makefile.am
@@ -1,3 +1,23 @@
 EXTRA_DIST=autogen.sh
 
 SUBDIRS=src
+
+
+
+INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install
+ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
+ZIP_EXCLUDED=include 
+
+
+
+zip:
+	rm -f $(ZIPFILE)
+	rm -rf $(INSTALLDIR)
+	mkdir -p $(INSTALLDIR)
+	make install DESTDIR=$(INSTALLDIR)
+	cd $(INSTALLDIR)/$(prefix) && rm -rf $(ZIP_EXCLUDED) && \
+	zip -r $(ZIPFILE) *
+
+clean-local:
+	-rm -rf $(PACKAGE)-install
+	-rm -f $(PACKAGE)-win32-$(VERSION).zip
diff --git a/linphone/mediastreamer2/plugins/msx264/configure.ac b/linphone/mediastreamer2/plugins/msx264/configure.ac
index 5ee6a0544..100756692 100644
--- a/linphone/mediastreamer2/plugins/msx264/configure.ac
+++ b/linphone/mediastreamer2/plugins/msx264/configure.ac
@@ -27,6 +27,8 @@ case $target_os in
 	;;
 esac
 
+AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes)
+
 if test "$mingw_found" = "yes" ; then
 	AC_MSG_NOTICE([Hacking libtool to work with mingw...])
 	sed -e 's/\*\" \$a_deplib \"\*/\*/' < ./libtool > libtool.tmp
@@ -64,26 +66,27 @@ AC_ARG_ENABLE(hacked-x264,
 )
 
 dnl test for ffmpeg presence
-PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 50.0.0 ],ffmpeg_found=yes , ffmpeg_found=no)
+PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec >= 50.0.0 ],ffmpeg_found=yes , ffmpeg_found=no)
 dnl workaround for debian...
-PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 0d.50.0.0 ], ffmpeg_found=yes, ffmpeg_found=no)
+PKG_CHECK_MODULES(LIBAVCODEC, [libavcodec >= 0d.50.0.0 ], ffmpeg_found=yes, ffmpeg_found=no)
 if test x$ffmpeg_found = xno ; then
 	AC_MSG_ERROR([Could not find ffmpeg headers and library. This is mandatory for video support])
 fi
 
+PKG_CHECK_MODULES(LIBSWSCALE, [libswscale >= 0.7.0])
+
+
 dnl check for new/old ffmpeg header file layout
 CPPFLAGS_save=$CPPFLAGS
-CPPFLAGS=$FFMPEG_CFLAGS
+CPPFLAGS=$LIBAVCODEC_CFLAGS
 AC_CHECK_HEADERS(libavcodec/avcodec.h)
 CPPFLAGS=$CPPFLAGS_save
 
-CFLAGS="$CFLAGS \$(MEDIASTREAMER_CFLAGS) \$(FFMPEG_CFLAGS)"
 if test "$hacked_x264" = "yes" ; then 
-	AC_MSG_WARN([Trying to compile with multislicing patched version of X264])
+	AC_MSG_NOTICE([Trying to compile with multislicing patched version of X264])
 	CFLAGS="$CFLAGS -DHACKED_X264"
 fi
 
-LIBS="$LIBS \$(X264_LIBS) "
 LDFLAGS="$LDFLAGS -rdynamic "
 
 dnl define path of plugins:
diff --git a/linphone/mediastreamer2/plugins/msx264/src/Makefile.am b/linphone/mediastreamer2/plugins/msx264/src/Makefile.am
index 88b3f2415..c4c423605 100644
--- a/linphone/mediastreamer2/plugins/msx264/src/Makefile.am
+++ b/linphone/mediastreamer2/plugins/msx264/src/Makefile.am
@@ -4,3 +4,24 @@ plugins_LTLIBRARIES=libmsx264.la
 
 libmsx264_la_SOURCES=msx264.c
 
+libmsx264_la_LIBADD=\
+	$(LIBAVCODEC_LIBS) \
+	$(LIBSWSCALE_LIBS) \
+	$(MEDIASTREAMER_LIBS) \
+	$(X264_LIBS)
+
+libmsx264_la_LDFLAGS=-no-undefined
+
+AM_CFLAGS=	$(LIBAVCODEC_CFLAGS) \
+		$(LIBSWSCALE_CFLAGS) \
+		$(MEDIASTREAMER_CFLAGS)\
+		$(X264_CFLAGS)
+
+if BUILD_WIN32
+#hack for mingw to force plugins dll to be where we want them to be.
+install-data-hook:
+	mv $(DESTDIR)$(pluginsdir)/../bin/*.dll \
+	$(DESTDIR)$(pluginsdir)/.
+	rm -f $(DESTDIR)$(pluginsdir)/*.la
+	rm -f $(DESTDIR)$(pluginsdir)/*.dll.a
+endif
diff --git a/linphone/reconfig-SuSE b/linphone/reconfig-SuSE
deleted file mode 100755
index 8a9aea659..000000000
--- a/linphone/reconfig-SuSE
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-echo "Generating build scripts in linphone..."
-libtoolize --copy --force
-chmod 644 macros/*
-cp /opt/gnome2/share/aclocal/gnome2-macros/* macros/.
-aclocal-1.6 -I macros
-autoheader
-automake-1.6 --add-missing --copy
-autoconf
-rm -rf config.cache
-
-echo "Generating build scripts in osipua..."
-cd osipua && ./reconfig
-
-echo "Generating build scripts in oRTP..."
-cd ..
-cd oRTP && ./reconfig
-
-echo "Generating build scripts in speex..."
-cd ..
-cd speex && libtoolize --copy --force && aclocal-1.6 && automake-1.6 --add-missing --copy && autoconf -f
-
-
diff --git a/linphone/support/.cvsignore b/linphone/support/.cvsignore
deleted file mode 100644
index 6e5ca7ed4..000000000
--- a/linphone/support/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
diff --git a/linphone/win32/config.h b/linphone/win32/config.h
deleted file mode 100755
index 171a6b3a2..000000000
--- a/linphone/win32/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef WIN32_CONFIG_H
-#define WIN32_CONFIG_H
-
-#define LINPHONE_VERSION "1.3.0"
-#define PACKAGE_PLUGINS_DIR "/"
-
-#endif