diff --git a/linphone/Makefile.am b/linphone/Makefile.am
index ea8b8f75b..284441cd5 100644
--- a/linphone/Makefile.am
+++ b/linphone/Makefile.am
@@ -13,20 +13,43 @@ SUBDIRS = m4 pixmaps po ipkg $(ORTP_DIR) mediastreamer2\
 		coreapi console gtk-glade share
 
 
+
+ACLOCAL_FLAGS=-I$(top_srcdir)/m4
+
+
+INSTALLDIR=$(shell cd $(top_builddir) && pwd)/linphone-install
+INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
+ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
+ZIP_EXCLUDED=include lib \
+		share/sounds/linphone/rings/synth.wav \
+		share/sounds/linphone/rings/tapping.wav \
+		share/sounds/linphone/rings/orig.wav 
+
+GTK_PREFIX=/usr/local
+GTK_FILELIST=gtk+-2.16.2.filelist
+GTK_FILELIST_PATH=$(shell cd $(top_srcdir) && pwd)/$(GTK_FILELIST)
+LINPHONEDEPS_FILELIST=linphone-deps.filelist
+WINBINDIST_FILES=$(shell cat $(top_srcdir)/$(LINPHONEDEPS_FILELIST))
+ISS_SCRIPT=linphone.iss
+ISS_SCRIPT_PATH=$(shell cd $(top_srcdir) && pwd)/$(ISS_SCRIPT)
+#path to Inno Setup 5 compiler
+ISCC=/c/Program\ Files/Inno\ Setup\ 5/ISCC.exe
+PACKAGE_WIN32_FILELIST=$(PACKAGE)-win32.filelist
+
 EXTRA_DIST = config.rpath  BUGS linphone.kdevprj \
 				intltool-extract.in	\
 				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
+				linphone.spec.in \
+				$(GTK_FILELIST) \
+				gen-gtkfilelist.sh \
+				$(LINPHONEDEPS_FILELIST) \
+				$(ISS_SCRIPT).in
 
-DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
-
-INSTALLDIR=$(shell cd $(top_builddir) && pwd)/linphone-install
-ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
+DISTCLEANFILES= intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache $(ISS_SCRIPT) $(PACKAGE_WIN32_FILELIST)
 
 # `make rpm'
 
@@ -47,13 +70,57 @@ rpm:
 
 #a zip containing win32 binaries, suitable to generate an installer
 
+other-cherrypick:
+	cd $(GTK_PREFIX) && \
+	for file in $(WINBINDIST_FILES) ; do \
+		if test -d $$file; then \
+			mkdir -p $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+		else \
+			cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+		fi \
+	done 
 
+gtk-cherrypick:
+	cd $(GTK_PREFIX) && \
+	for file in `cat $(GTK_FILELIST_PATH)` ; do \
+		if test -d $$file; then \
+			mkdir -p $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+		else \
+			cp $$file $(INSTALLDIR_WITH_PREFIX)/$$file ;\
+		fi \
+	done && \
+	cp -rf share/themes $(INSTALLDIR_WITH_PREFIX)/share/.
 
 zip:
 	rm -f $(ZIPFILE)
 	rm -rf $(INSTALLDIR)
 	mkdir -p $(INSTALLDIR)
 	make install DESTDIR=$(INSTALLDIR)
-	cd $(INSTALLDIR)/$(prefix) && zip -r $(ZIPFILE) *
+#remove unwanted linphone stuff
+	cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(ZIP_EXCLUDED)
+#add gtk dlls and files
+	make gtk-cherrypick
+	make other-cherrypick
+	cp -f $(top_srcdir)/gtk-glade/gtkrc $(INSTALLDIR_WITH_PREFIX)/.
+	cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/.
+	cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/.
+	cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(ZIPFILE) *
+
+setup.exe: zip
+	cd $(INSTALLDIR_WITH_PREFIX) && \
+	rm -f $(PACKAGE_WIN32_FILELIST) && \
+	for file in `find` ; do \
+		if ! test -d $$file ; then \
+			echo "Source: $$file; Destdir: {app}\\`dirname $$file`; Flags: ignoreversion" \
+			>> $(PACKAGE_WIN32_FILELIST) ;\
+		fi \
+	done
+	cp $(ISS_SCRIPT) $(INSTALLDIR_WITH_PREFIX)/.
+	cd $(INSTALLDIR_WITH_PREFIX) && \
+	$(ISCC) $(ISS_SCRIPT) 
+	mv $(INSTALLDIR_WITH_PREFIX)/Output/setup.exe $(PACKAGE)-$(VERSION)-setup.exe
+	rm -rf $(INSTALLDIR_WITH_PREFIX)/Output
+	rm -f $(INSTALLDIR_WITH_PREFIX)/$(PACKAGE_WIN32_FILELIST)
+	rm -f $(INSTALLDIR_WITH_PREFIX)/$(ISS_SCRIPT)
+
 
-	
\ 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 585329aa5..08afc7bda 100644
--- a/linphone/README.mingw
+++ b/linphone/README.mingw
@@ -14,34 +14,40 @@ Software to install
 
 
 Building
+********
 
-WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del to start the windows system monitor, you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu. Kill it. Don't know what it is, but once killed, windows runs normally.
-
-
-Building
-
-WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del to start the windows system monitor, you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu. Kill it. Don't know what it is, but once killed, windows runs normally.
+WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del to start the windows system monitor,
+ you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu.
+Kill it. Don't know what it is, but once killed, windows runs normally.
 
 #use ActiveState perl instead of mingw perl
 export PERL="/c/Perl/bin/perl"
 export INTLTOOL_PERL="/c/Perl/bin/perl"
 #run autogen.sh after a git/svn checkout or update
 ./autogen.sh
-./configure --enable-shared --disable-static --with-osip=/usr/local
+./configure --prefix=/opt/linphone --enable-shared --disable-static --with-osip=/usr/local --with-gsm=/usr/local
 make
-make install DESTDIR=/c/linphone-install
-
+#will install to /opt/linphone, useful for compilation of plugins.
+make install
+#make a binary zip of linphone
+make zip
+#additionally you can make binary installer if you have Inno Setup 5 installed in its default path
+make setup.exe
 
 #build plugins
 cd mediastreamer2/plugins/msx264
 ./autogen.sh
-PKG_CONFIG_PATH=/c/linphone-install/lib/pkgconfig ./configure --enable-shared --disable-static 
-make install DESTDIR=/c/msx264-install
+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
 
 cd coreapi/plugins/buddyloolup
 ./autogen.sh
-PKG_CONFIG_PATH=/c/linphone-install/lib/pkgconfig ./configure --enable-shared --disable-static 
-make install DESTDIR=/c/buddylookup-install
+PKG_CONFIG_PATH=/opt/linphone/lib/pkgconfig ./configure --prefix=/opt/linphone --enable-shared --disable-static 
+make
+#make a binary zip of this plugin
+make zip
 
 
 ******************************************************
diff --git a/linphone/configure.in b/linphone/configure.in
index 2227e49c5..cdab69b90 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -74,7 +74,7 @@ AM_GNU_GETTEXT([external])
 else
 AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
 AC_DEFINE(HAVE_GETTEXT,1,[Tells wheter localisation is possible])
-LIBS="$LIBS -lintl"
+LIBS="$LIBS -L/usr/local/lib -lintl"
 fi
 
 GETTEXT_PACKAGE=linphone
@@ -183,17 +183,24 @@ AC_DEFINE(VINCENT_MAURY_RSVP,1,[Tell whether RSVP support
 should be compiled.]) )
 
 if test "x${prefix}" = "xNONE"; then
-	prefix=${ac_default_prefix}
+	package_prefix=${ac_default_prefix}
+else
+	package_prefix=${prefix}
+fi
+
+if test x$mingw_found = xyes ; then
+dnl allow binaries to install everywhere
+package_prefix="."
 fi
 
 dnl Set PACKAGE_LOCALE_DIR in config.h.
 DATADIRNAME=share
-AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale",[Defines the place where locales can be found])
+AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${package_prefix}/${DATADIRNAME}/locale",[Defines the place where locales can be found])
 
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/${DATADIRNAME}",[Defines the place where data are found])
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/${DATADIRNAME}",[Defines the place where data are found])
 
 dnl Set PACKAGE_SOUND_DIR in config.h.
-AC_DEFINE_UNQUOTED(PACKAGE_SOUND_DIR, "${prefix}/${DATADIRNAME}/sounds/linphone",[Defines the place where linphone sounds are found])
+AC_DEFINE_UNQUOTED(PACKAGE_SOUND_DIR, "${package_prefix}/${DATADIRNAME}/sounds/linphone",[Defines the place where linphone sounds are found])
 
 
 dnl check if we have the getifaddrs() sytem call
@@ -302,16 +309,20 @@ AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
 AM_CONDITIONAL(ENABLE_MANUAL, test x$have_sgmltools$build_manual = xyesyes )
 
 dnl for external use of linphone libs
-LINPHONE_CFLAGS="-I${includedir} -I${includedir}/linphone -I${includedir}/ortp "
+LINPHONE_CFLAGS="-I${includedir} -I${includedir}/linphone  "
 LINPHONE_LIBS="-L${libdir}  -llinphone"
+
+if test x$mingw_found = xyes ; then
+	LINPHONE_LIBS="$LINPHONE_LIBS $OSIP_LIBS"
+fi
 AC_SUBST(LINPHONE_CFLAGS)
 AC_SUBST(LINPHONE_LIBS)
 
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-AC_DEFINE_UNQUOTED(LINPHONE_PLUGINS_DIR, "${prefix}/lib/liblinphone/plugins" ,[path of liblinphone plugins, not mediastreamer2 plugins])
-LINPHONE_PLUGINS_DIR="${prefix}/lib/liblinphone/plugins"
+AC_DEFINE_UNQUOTED(LINPHONE_PLUGINS_DIR, "${package_prefix}/lib/liblinphone/plugins" ,[path of liblinphone plugins, not mediastreamer2 plugins])
+LINPHONE_PLUGINS_DIR="${package_prefix}/lib/liblinphone/plugins"
 AC_SUBST(LINPHONE_PLUGINS_DIR)
 
 AC_ARG_ENABLE(external-ortp,
@@ -365,6 +376,7 @@ share/ja/Makefile
 share/cs/Makefile
 share/linphone.pc
 linphone.spec
+linphone.iss
 ])
 
 echo "Linphone build configuration ended."
diff --git a/linphone/coreapi/linphonecore.c b/linphone/coreapi/linphonecore.c
index a0a9497ca..2f9803f25 100644
--- a/linphone/coreapi/linphonecore.c
+++ b/linphone/coreapi/linphonecore.c
@@ -672,8 +672,8 @@ void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vtable, co
 	rtp_profile_set_payload(&av_profile,98,linphone_h263_1998);
 
 	linphone_h263_old=payload_type_clone(&payload_type_h263);
-    payload_type_set_recv_fmtp(linphone_h263_old,"QCIF=2");
-    rtp_profile_set_payload(&av_profile,34,linphone_h263_old);
+	payload_type_set_recv_fmtp(linphone_h263_old,"QCIF=2");
+ 	rtp_profile_set_payload(&av_profile,34,linphone_h263_old);
 
 	linphone_mp4v_es=payload_type_clone(&payload_type_mp4v);
 	payload_type_set_recv_fmtp(linphone_mp4v_es,"profile-level-id=3");
diff --git a/linphone/coreapi/plugins/buddylookup/INSTALL b/linphone/coreapi/plugins/buddylookup/INSTALL
old mode 100644
new mode 100755
index 8b82ade08..5458714e1
--- a/linphone/coreapi/plugins/buddylookup/INSTALL
+++ b/linphone/coreapi/plugins/buddylookup/INSTALL
@@ -2,15 +2,15 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
+This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
+Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
@@ -67,15 +67,12 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
 Compilers and Options
 =====================
 
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -88,7 +85,7 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-   You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
@@ -100,24 +97,10 @@ architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
+By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -140,7 +123,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-   Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -152,36 +135,14 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -207,9 +168,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -218,7 +179,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-   Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -237,19 +198,11 @@ an Autoconf bug.  Until the bug is fixed you can use this workaround:
 `configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
 
 `--help'
 `-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     Print a summary of the options to `configure', and exit.
 
 `--version'
 `-V'
@@ -276,16 +229,6 @@ operates.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/linphone/coreapi/plugins/buddylookup/Makefile.am b/linphone/coreapi/plugins/buddylookup/Makefile.am
index 1bfdcf486..281d0c4cc 100644
--- a/linphone/coreapi/plugins/buddylookup/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/Makefile.am
@@ -1 +1,21 @@
 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 $(PACKAGE)-win32-$(VERSION).zip
diff --git a/linphone/coreapi/plugins/buddylookup/autogen.sh b/linphone/coreapi/plugins/buddylookup/autogen.sh
index ee0dd4838..cbe603ee8 100755
--- a/linphone/coreapi/plugins/buddylookup/autogen.sh
+++ b/linphone/coreapi/plugins/buddylookup/autogen.sh
@@ -10,7 +10,7 @@ else
 	AUTOMAKE=automake-${AM_VERSION}
 fi
 
-echo "Generating build scripts in mediastreamer..."
+echo "Generating build scripts in buddylookup..."
 set -x
 libtoolize --copy --force
 autoheader
diff --git a/linphone/coreapi/plugins/buddylookup/configure.ac b/linphone/coreapi/plugins/buddylookup/configure.ac
index 3f1fd3d0e..3ddda90f8 100644
--- a/linphone/coreapi/plugins/buddylookup/configure.ac
+++ b/linphone/coreapi/plugins/buddylookup/configure.ac
@@ -9,6 +9,12 @@ AM_INIT_AUTOMAKE([tar-ustar])
 
 AC_CANONICAL_SYSTEM
 
+case $target_os in
+	*mingw*)
+		mingw_found=yes
+	;;
+esac
+
 AC_MSG_CHECKING([warning make an error on compilation])
 AC_ARG_ENABLE(strict,
 [  --enable-strict       Enable error on compilation warning [default=yes]],
@@ -26,8 +32,8 @@ AC_PROG_LIBTOOL
 
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= 2.4.0)
 
+PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= 2.4.0)
 PKG_CHECK_MODULES(LIBLINPHONE, linphone >= 3.0.0)
 
 LINPHONE_PLUGINS_DIR="\$(libdir)/liblinphone/plugins/"
@@ -48,6 +54,8 @@ LDFLAGS="$LDFLAGS -rdynamic "
 	fi
 fi
 
+AM_CONDITIONAL(BUILD_WIN32, test x$mingw_found = xyes)
+
 AC_OUTPUT(
 Makefile
 src/Makefile
diff --git a/linphone/coreapi/plugins/buddylookup/src/Makefile.am b/linphone/coreapi/plugins/buddylookup/src/Makefile.am
index 94d4bd73b..f965a9d8c 100644
--- a/linphone/coreapi/plugins/buddylookup/src/Makefile.am
+++ b/linphone/coreapi/plugins/buddylookup/src/Makefile.am
@@ -4,7 +4,17 @@ plugins_LTLIBRARIES=libbuddylookup.la
 
 libbuddylookup_la_SOURCES=lookup.c
 
-libbuddylookup_la_LIBADD=$(LIBSOUP_LIBS) $(LIBLINPHONE_LIBS)
+libbuddylookup_la_LIBADD=$(LIBSOUP_LIBS) $(LIBLINPHONE_LIBS) 
+
+libbuddylookup_la_LDFLAGS=-no-undefined
 
 AM_CFLAGS= $(LIBLINPHONE_CFLAGS) $(LIBSOUP_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/libbuddylookup*.dll \
+	$(DESTDIR)$(pluginsdir)/.
+	rm -f $(DESTDIR)$(pluginsdir)/*.la
+	rm -f $(DESTDIR)$(pluginsdir)/*.dll.a
+endif
diff --git a/linphone/coreapi/sipsetup.c b/linphone/coreapi/sipsetup.c
index e8b12e9ed..5dd63fe90 100644
--- a/linphone/coreapi/sipsetup.c
+++ b/linphone/coreapi/sipsetup.c
@@ -23,14 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "linphonecore.h"
 
-#ifndef LINPHONE_PLUGINS_DIR
-#ifdef WIN32
-#define LINPHONE_PLUGINS_DIR "liblinphone\\plugins\\"
-#else
-#define LINPHONE_PLUGINS_DIR "."
-#endif
-#endif
-
 static SipSetup *all_sip_setups[]={
 	NULL
 };
diff --git a/linphone/gen-gtkfilelist.sh b/linphone/gen-gtkfilelist.sh
new file mode 100755
index 000000000..10a7de133
--- /dev/null
+++ b/linphone/gen-gtkfilelist.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# this script is used to generate a file list of gtk+ files necessary for
+# execution. This is useful for generating linphone packages.
+# It must be run within a gtk+ binary bundle tree, such as in the zip bundle
+# downloadable from www.gtk.org
+echo bin
+echo bin/libglade-2.0.0.dll
+find bin -name *.dll
+find lib/gtk-2.0
+find etc
+find share/locale/fr
+find share/locale/de
+find share/locale/sv
+find share/locale/cs
+find share/locale/es
+find share/locale/hu
+find share/locale/it
+find share/locale/ja
+find share/locale/nl
+find share/locale/pl
+find share/locale/ru
+find share/locale/pt_BR
+find share/themes
+
diff --git a/linphone/gtk+-2.16.2.filelist b/linphone/gtk+-2.16.2.filelist
new file mode 100755
index 000000000..5dce6ce85
--- /dev/null
+++ b/linphone/gtk+-2.16.2.filelist
@@ -0,0 +1,165 @@
+bin
+bin/libglade-2.0.0.dll
+bin/intl.dll
+bin/jpeg62.dll
+bin/libasprintf-0.dll
+bin/libatk-1.0-0.dll
+bin/libcairo-2.dll
+bin/libgailutil-18.dll
+bin/libgdk-win32-2.0-0.dll
+bin/libgdk_pixbuf-2.0-0.dll
+bin/libgettextlib-0-17.dll
+bin/libgettextpo-0.dll
+bin/libgettextsrc-0-17.dll
+bin/libgio-2.0-0.dll
+bin/libglib-2.0-0.dll
+bin/libgmodule-2.0-0.dll
+bin/libgobject-2.0-0.dll
+bin/libgthread-2.0-0.dll
+bin/libgtk-win32-2.0-0.dll
+bin/libpango-1.0-0.dll
+bin/libpangocairo-1.0-0.dll
+bin/libpangoft2-1.0-0.dll
+bin/libpangowin32-1.0-0.dll
+bin/libpng12-0.dll
+bin/libtiff3.dll
+bin/zlib1.dll
+lib/gtk-2.0
+lib/gtk-2.0/2.10.0
+lib/gtk-2.0/2.10.0/engines
+lib/gtk-2.0/2.10.0/engines/libpixmap.dll
+lib/gtk-2.0/2.10.0/engines/libwimp.dll
+lib/gtk-2.0/2.10.0/loaders
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
+lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
+lib/gtk-2.0/include
+lib/gtk-2.0/include/gdkconfig.h
+lib/gtk-2.0/modules
+lib/gtk-2.0/modules/libgail.dll
+etc
+etc/gtk-2.0
+etc/gtk-2.0/gdk-pixbuf.loaders
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
+etc/pango
+etc/pango/pango.modules
+share/locale/fr
+share/locale/fr/LC_MESSAGES
+share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/fr/LC_MESSAGES/gettext-runtime.mo
+share/locale/fr/LC_MESSAGES/gettext-tools.mo
+share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/fr/LC_MESSAGES/gtk20-properties.mo
+share/locale/fr/LC_MESSAGES/gtk20.mo
+share/locale/de
+share/locale/de/LC_MESSAGES
+share/locale/de/LC_MESSAGES/atk10.mo
+share/locale/de/LC_MESSAGES/gettext-runtime.mo
+share/locale/de/LC_MESSAGES/gettext-tools.mo
+share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/de/LC_MESSAGES/gtk20-properties.mo
+share/locale/de/LC_MESSAGES/gtk20.mo
+share/locale/sv
+share/locale/sv/LC_MESSAGES
+share/locale/sv/LC_MESSAGES/atk10.mo
+share/locale/sv/LC_MESSAGES/gettext-runtime.mo
+share/locale/sv/LC_MESSAGES/gettext-tools.mo
+share/locale/sv/LC_MESSAGES/glib20.mo
+share/locale/sv/LC_MESSAGES/gtk20-properties.mo
+share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/cs
+share/locale/cs/LC_MESSAGES
+share/locale/cs/LC_MESSAGES/atk10.mo
+share/locale/cs/LC_MESSAGES/gettext-runtime.mo
+share/locale/cs/LC_MESSAGES/gettext-tools.mo
+share/locale/cs/LC_MESSAGES/glib20.mo
+share/locale/cs/LC_MESSAGES/gtk20-properties.mo
+share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/es
+share/locale/es/LC_MESSAGES
+share/locale/es/LC_MESSAGES/atk10.mo
+share/locale/es/LC_MESSAGES/gettext-runtime.mo
+share/locale/es/LC_MESSAGES/gettext-tools.mo
+share/locale/es/LC_MESSAGES/glib20.mo
+share/locale/es/LC_MESSAGES/gtk20-properties.mo
+share/locale/es/LC_MESSAGES/gtk20.mo
+share/locale/hu
+share/locale/hu/LC_MESSAGES
+share/locale/hu/LC_MESSAGES/atk10.mo
+share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hu/LC_MESSAGES/gtk20-properties.mo
+share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/it
+share/locale/it/LC_MESSAGES
+share/locale/it/LC_MESSAGES/atk10.mo
+share/locale/it/LC_MESSAGES/gettext-runtime.mo
+share/locale/it/LC_MESSAGES/gettext-tools.mo
+share/locale/it/LC_MESSAGES/glib20.mo
+share/locale/it/LC_MESSAGES/gtk20-properties.mo
+share/locale/it/LC_MESSAGES/gtk20.mo
+share/locale/ja
+share/locale/ja/LC_MESSAGES
+share/locale/ja/LC_MESSAGES/atk10.mo
+share/locale/ja/LC_MESSAGES/gettext-runtime.mo
+share/locale/ja/LC_MESSAGES/gettext-tools.mo
+share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ja/LC_MESSAGES/gtk20-properties.mo
+share/locale/ja/LC_MESSAGES/gtk20.mo
+share/locale/nl
+share/locale/nl/LC_MESSAGES
+share/locale/nl/LC_MESSAGES/atk10.mo
+share/locale/nl/LC_MESSAGES/gettext-runtime.mo
+share/locale/nl/LC_MESSAGES/gettext-tools.mo
+share/locale/nl/LC_MESSAGES/glib20.mo
+share/locale/nl/LC_MESSAGES/gtk20-properties.mo
+share/locale/nl/LC_MESSAGES/gtk20.mo
+share/locale/pl
+share/locale/pl/LC_MESSAGES
+share/locale/pl/LC_MESSAGES/atk10.mo
+share/locale/pl/LC_MESSAGES/gettext-runtime.mo
+share/locale/pl/LC_MESSAGES/gettext-tools.mo
+share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/pl/LC_MESSAGES/gtk20-properties.mo
+share/locale/pl/LC_MESSAGES/gtk20.mo
+share/locale/ru
+share/locale/ru/LC_MESSAGES
+share/locale/ru/LC_MESSAGES/atk10.mo
+share/locale/ru/LC_MESSAGES/gettext-runtime.mo
+share/locale/ru/LC_MESSAGES/gettext-tools.mo
+share/locale/ru/LC_MESSAGES/glib20.mo
+share/locale/ru/LC_MESSAGES/gtk20-properties.mo
+share/locale/ru/LC_MESSAGES/gtk20.mo
+share/locale/pt_BR
+share/locale/pt_BR/LC_MESSAGES
+share/locale/pt_BR/LC_MESSAGES/atk10.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
+share/locale/pt_BR/LC_MESSAGES/glib20.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo
+share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+share/themes
+share/themes/Default
+share/themes/Default/gtk-2.0-key
+share/themes/Default/gtk-2.0-key/gtkrc
+share/themes/Emacs
+share/themes/Emacs/gtk-2.0-key
+share/themes/Emacs/gtk-2.0-key/gtkrc
+share/themes/MS-Windows
+share/themes/MS-Windows/gtk-2.0
+share/themes/MS-Windows/gtk-2.0/gtkrc
+share/themes/Raleigh
+share/themes/Raleigh/gtk-2.0
+share/themes/Raleigh/gtk-2.0/gtkrc
diff --git a/linphone/gtk-glade/Makefile.am b/linphone/gtk-glade/Makefile.am
index bb5da6db3..884d9ecfb 100644
--- a/linphone/gtk-glade/Makefile.am
+++ b/linphone/gtk-glade/Makefile.am
@@ -43,11 +43,17 @@ linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
 			$(LIBGTK_LIBS) $(INTLLIBS) \
 			$(LIBGLADE_LIBS)
 
-if BUILD_WIN32
-linphone_3_LDADD+=-lwininet
-endif
 
+if BUILD_WIN32
+
+linphone.res:	linphone.rc linphone.ico
+	windres linphone.rc -O coff -o linphone.res
+
+linphone_3_LDADD+=linphone.res -lwininet
+linphone_3_LDFLAGS=-Wl,--export-all-symbols -mwindows
+else
 linphone_3_LDFLAGS=-export-dynamic
+endif
 
 gladedir=$(datadir)/linphone
 glade_DATA=$(GLADE_FILES) $(PIXMAPS)
diff --git a/linphone/gtk-glade/linphone.h b/linphone/gtk-glade/linphone.h
index c330138f3..755de2f22 100644
--- a/linphone/gtk-glade/linphone.h
+++ b/linphone/gtk-glade/linphone.h
@@ -19,13 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#else
-#define PACKAGE_DATA_DIR "./"
-
-#ifndef LINPHONE_VERSION
-#define LINPHONE_VERSION "3.1.2-20090520"
-#endif
-
 #endif
 
 #include <gtk/gtk.h>
diff --git a/linphone/gtk-glade/linphone.rc b/linphone/gtk-glade/linphone.rc
new file mode 100755
index 000000000..9455ab6b3
--- /dev/null
+++ b/linphone/gtk-glade/linphone.rc
@@ -0,0 +1,5 @@
+// This file is automatically generated by wxDev-C++.
+// All changes to this file will be lost when the project is recompiled.
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "linphone.ico"
+
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 319ff89f4..1cb43ee23 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -31,14 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/stat.h>
 #include <unistd.h>
 
-#ifndef GETTEXT_PACKAGE
-#define GETTEXT_PACKAGE "linphone"
-#endif
-
-#ifndef PACKAGE_LOCALE_DIR
-#define PACKAGE_LOCALE_DIR "share/locale/"
-#endif
-
 #define LINPHONE_ICON "linphone2.png"
 
 const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;
diff --git a/linphone/linphone-deps.filelist b/linphone/linphone-deps.filelist
new file mode 100755
index 000000000..40d31692f
--- /dev/null
+++ b/linphone/linphone-deps.filelist
@@ -0,0 +1,11 @@
+./bin/avcodec-52.dll
+./bin/avformat-52.dll
+./bin/avutil-50.dll
+./bin/exosip2.dll
+./bin/libogg-0.dll
+./bin/libsoup-2.4-1.dll
+./bin/libtheora-0.dll
+./bin/libxml2.dll
+./bin/osip2.dll
+./bin/osipparser2.dll
+./bin/swscale-0.dll
diff --git a/linphone/linphone.iss.in b/linphone/linphone.iss.in
new file mode 100644
index 000000000..f2dd5c4a7
--- /dev/null
+++ b/linphone/linphone.iss.in
@@ -0,0 +1,31 @@
+[Setup]
+AppName=Linphone
+AppVerName=Linphone version @LINPHONE_VERSION@
+AppPublisher=linphone.org
+AppPublisherURL=http://www.linphone.org
+AppSupportURL=http://www.linphone.org
+AppUpdatesURL=http://www.linphone.org
+DefaultDirName={pf}\Linphone
+DefaultGroupName=Linphone
+LicenseFile=COPYING
+;InfoBeforeFile=README
+OutputBaseFilename=setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+#include "linphone-win32.filelist"
+
+[Icons]
+Name: "{group}\Linphone"; Filename: "{app}\bin\linphone-3.exe" ; WorkingDir: "{app}"
+Name: "{userdesktop}\Linphone"; Filename: "{app}\bin\linphone-3.exe"; WorkingDir: "{app}" ; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\bin\linphone-3.exe"; Description: "{cm:LaunchProgram,Linphone}"; WorkingDir: "{app}" ; Flags: nowait postinstall skipifsilent
+
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/configure.ac b/linphone/mediastreamer2/configure.ac
index acb7a5b59..951adfde2 100644
--- a/linphone/mediastreamer2/configure.ac
+++ b/linphone/mediastreamer2/configure.ac
@@ -472,16 +472,22 @@ dnl check various things
 AC_FUNC_ALLOCA
 
 if test "x${prefix}" = "xNONE"; then
-	prefix=${ac_default_prefix}
+	package_prefix=${ac_default_prefix}
+else
+	package_prefix=${prefix}
+fi
+
+if test x$mingw_found = xyes ; then
+	package_prefix="."
 fi
 
 dnl define path of plugins:
-AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR, "${prefix}/lib/mediastreamer/plugins" ,[path of plugins])
-PACKAGE_PLUGINS_DIR="${prefix}/lib/mediastreamer/plugins"
+AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR, "${package_prefix}/lib/mediastreamer/plugins" ,[path of plugins])
+PACKAGE_PLUGINS_DIR="${package_prefix}/lib/mediastreamer/plugins"
 AC_SUBST(PACKAGE_PLUGINS_DIR)
 
 PACKAGE_DATA_DIR="$prefix/share"
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "$prefix/share" ,[path of data])
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "${package_prefix}/share" ,[path of data])
 AC_SUBST(PACKAGE_DATA_DIR)
 
 dnl check for video4linux headers
diff --git a/linphone/mediastreamer2/mediastreamer.pc.in b/linphone/mediastreamer2/mediastreamer.pc.in
index e2c6106ef..0975db025 100644
--- a/linphone/mediastreamer2/mediastreamer.pc.in
+++ b/linphone/mediastreamer2/mediastreamer.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: mediastreamer 
 Description: A mediastreaming library for telephony applications
-Depends: ortp
+Requires: ortp
 Version: @MEDIASTREAMER_VERSION@
 Libs: -L@libdir@ -lmediastreamer
 Cflags: -I@includedir@ 
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/share/Makefile.inc b/linphone/share/Makefile.inc
index 7deb66aae..47c01785f 100644
--- a/linphone/share/Makefile.inc
+++ b/linphone/share/Makefile.inc
@@ -14,7 +14,7 @@ $(linphone_help)/manual.html:
 	sgmltools $(srcdir)/manual.sgml
 
 install-data-local:
-			$(mkdir_p) $(DESTDIR)/$(linphone_manualdir)
+			$(mkdir_p) $(DESTDIR)$(linphone_manualdir)
 			-cp -f $(linphone_help)/*.html $(DESTDIR)/$(linphone_manualdir)/.
 			-cp -f $(linphone_help)/*.css $(DESTDIR)/$(linphone_manualdir)/.
 
diff --git a/linphone/share/linphone.pc.in b/linphone/share/linphone.pc.in
index abd76f414..f44eb2322 100644
--- a/linphone/share/linphone.pc.in
+++ b/linphone/share/linphone.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-
+Requires: mediastreamer ortp
 Name: liblinphone
 Description: All in one linphone libs.
 Version: @VERSION@
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