diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
index d9a00b820..9150f7e02 100644
--- a/dist/windows/clementine.nsi.in
+++ b/dist/windows/clementine.nsi.in
@@ -64,41 +64,36 @@ SectionEnd
 Section "Clementine" Clementine
   SetOutPath "$INSTDIR"
 
-  File "avcodec-gpl-52.dll"
-  File "avformat-gpl-52.dll"
-  File "avutil-gpl-50.dll"
+  File "avcodec-52.dll"
+  File "avformat-52.dll"
+  File "avutil-50.dll"
   File "clementine.exe"
   File "clementine.ico"
   File "glew32.dll"
-  File "iconv.dll"
-  File "libbz2.dll"
-  File "libdl.dll"
-  File "libfaac-0.dll"
-  File "libfaad-2.dll"
-  File "libFLAC-8.dll"
+  File "libfaac.dll"
+  File "libfaad.dll"
+  File "libFLAC.dll"
   File "libgcrypt-11.dll"
   File "libgcc_s_dw2-1.dll"
-  File "libgcc_s_sjlj-1.dll"
   File "libgio-2.0-0.dll"
   File "libglib-2.0-0.dll"
   File "libgmodule-2.0-0.dll"
   File "libgnutls-26.dll"
   File "libgobject-2.0-0.dll"
   File "libgpg-error-0.dll"
-  File "libgstaudio-0.10.dll"
-  File "libgstbase-0.10.dll"
-  File "libgstcontroller-0.10.dll"
-  File "libgstdshow-0.10.dll"
-  File "libgstinterfaces-0.10.dll"
-  File "libgstnet-0.10.dll"
-  File "libgstnetbuffer-0.10.dll"
-  File "libgstpbutils-0.10.dll"
-  File "libgstreamer-0.10.dll"
-  File "libgstriff-0.10.dll"
-  File "libgstrtp-0.10.dll"
-  File "libgstrtsp-0.10.dll"
-  File "libgstsdp-0.10.dll"
-  File "libgsttag-0.10.dll"
+  File "libgstaudio-0.10-0.dll"
+  File "libgstbase-0.10-0.dll"
+  File "libgstcontroller-0.10-0.dll"
+  File "libgstinterfaces-0.10-0.dll"
+  File "libgstnet-0.10-0.dll"
+  File "libgstnetbuffer-0.10-0.dll"
+  File "libgstpbutils-0.10-0.dll"
+  File "libgstreamer-0.10-0.dll"
+  File "libgstriff-0.10-0.dll"
+  File "libgstrtp-0.10-0.dll"
+  File "libgstrtsp-0.10-0.dll"
+  File "libgstsdp-0.10-0.dll"
+  File "libgsttag-0.10-0.dll"
   File "libgthread-2.0-0.dll"
   File "liblastfm.dll"
   File "libmms-0.dll"
@@ -111,7 +106,6 @@ Section "Clementine" Clementine
   File "libvorbis-0.dll"
   File "libvorbisenc-2.dll"
   File "libxml2-2.dll"
-  File "libxml2.dll"
   File "mingwm10.dll"
   File "QtCore4.dll"
   File "QtGui4.dll"
@@ -119,7 +113,6 @@ Section "Clementine" Clementine
   File "QtOpenGL4.dll"
   File "QtSql4.dll"
   File "QtXml4.dll"
-  File "z.dll"
   File "zlib1.dll"
 
   ; Check the OS.  If Vista or newer, use Default Programs
@@ -186,7 +179,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   SetOutPath "$INSTDIR\gstreamer-plugins"
   
   File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll"
-  File "/oname=libgstasfdemux.dll" "gstreamer-plugins\libgstasfdemux.dll"
+  File "/oname=libgstasf.dll" "gstreamer-plugins\libgstasf.dll"
   File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll"
   File "/oname=libgstaudioresample.dll" "gstreamer-plugins\libgstaudioresample.dll"
   File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll"
@@ -196,7 +189,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll"
   File "/oname=libgstfaac.dll" "gstreamer-plugins\libgstfaac.dll"
   File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll"
-  File "/oname=libgstffmpeg-gpl.dll" "gstreamer-plugins\libgstffmpeg-gpl.dll"
+  File "/oname=libgstffmpeg.dll" "gstreamer-plugins\libgstffmpeg.dll"
   File "/oname=libgstflac.dll" "gstreamer-plugins\libgstflac.dll"
   File "/oname=libgstgio.dll" "gstreamer-plugins\libgstgio.dll"
   File "/oname=libgsticydemux.dll" "gstreamer-plugins\libgsticydemux.dll"
@@ -206,9 +199,8 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstmms.dll" "gstreamer-plugins\libgstmms.dll"
   File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
   File "/oname=libgstqtdemux.dll" "gstreamer-plugins\libgstqtdemux.dll"
-  File "/oname=libgstqueue2.dll" "gstreamer-plugins\libgstqueue2.dll"
   File "/oname=libgstreplaygain.dll" "gstreamer-plugins\libgstreplaygain.dll"
-  File "/oname=libgstsoup.dll" "gstreamer-plugins\libgstsoup.dll"
+  File "/oname=libgstsouphttpsrc.dll" "gstreamer-plugins\libgstsouphttpsrc.dll"
   File "/oname=libgstspeex.dll" "gstreamer-plugins\libgstspeex.dll"
   File "/oname=libgsttypefindfunctions.dll" "gstreamer-plugins\libgsttypefindfunctions.dll"
   File "/oname=libgstudp.dll" "gstreamer-plugins\libgstudp.dll"
@@ -839,41 +831,36 @@ Section "Uninstall"
   completed:
   
   ; Delete all the files
-  Delete "$INSTDIR\avcodec-gpl-52.dll"
-  Delete "$INSTDIR\avformat-gpl-52.dll"
-  Delete "$INSTDIR\avutil-gpl-50.dll"
+  Delete "$INSTDIR\avcodec-52.dll"
+  Delete "$INSTDIR\avformat52.dll"
+  Delete "$INSTDIR\avutil-50.dll"
   Delete "$INSTDIR\clementine.ico"
   Delete "$INSTDIR\clementine.exe"
   Delete "$INSTDIR\glew32.dll"
-  Delete "$INSTDIR\iconv.dll"
-  Delete "$INSTDIR\libbz2.dll"
-  Delete "$INSTDIR\libdl.dll"
-  Delete "$INSTDIR\libfaac-0.dll"
-  Delete "$INSTDIR\libfaad-2.dll"
-  Delete "$INSTDIR\libFLAC-8.dll"
+  Delete "$INSTDIR\libfaac.dll"
+  Delete "$INSTDIR\libfaad.dll"
+  Delete "$INSTDIR\libFLAC.dll"
   Delete "$INSTDIR\libgcrypt-11.dll"
   Delete "$INSTDIR\libgcc_s_dw2-1.dll"
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
   Delete "$INSTDIR\libgio-2.0-0.dll"
   Delete "$INSTDIR\libglib-2.0-0.dll"
   Delete "$INSTDIR\libgmodule-2.0-0.dll"
   Delete "$INSTDIR\libgnutls-26.dll"
   Delete "$INSTDIR\libgobject-2.0-0.dll"
   Delete "$INSTDIR\libgpg-error-0.dll"
-  Delete "$INSTDIR\libgstaudio-0.10.dll"
-  Delete "$INSTDIR\libgstbase-0.10.dll"
-  Delete "$INSTDIR\libgstcontroller-0.10.dll"
-  Delete "$INSTDIR\libgstdshow-0.10.dll"
-  Delete "$INSTDIR\libgstinterfaces-0.10.dll"
-  Delete "$INSTDIR\libgstnet-0.10.dll"
-  Delete "$INSTDIR\libgstnetbuffer-0.10.dll"
-  Delete "$INSTDIR\libgstpbutils-0.10.dll"
-  Delete "$INSTDIR\libgstreamer-0.10.dll"
-  Delete "$INSTDIR\libgstriff-0.10.dll"
-  Delete "$INSTDIR\libgstrtp-0.10.dll"
-  Delete "$INSTDIR\libgstrtsp-0.10.dll"
-  Delete "$INSTDIR\libgstsdp-0.10.dll"
-  Delete "$INSTDIR\libgsttag-0.10.dll"
+  Delete "$INSTDIR\libgstaudio-0.10-0.dll"
+  Delete "$INSTDIR\libgstbase-0.10-0.dll"
+  Delete "$INSTDIR\libgstcontroller-0.10-0.dll"
+  Delete "$INSTDIR\libgstinterfaces-0.10-0.dll"
+  Delete "$INSTDIR\libgstnet-0.10-0.dll"
+  Delete "$INSTDIR\libgstnetbuffer-0.10-0.dll"
+  Delete "$INSTDIR\libgstpbutils-0.10-0.dll"
+  Delete "$INSTDIR\libgstreamer-0.10-0.dll"
+  Delete "$INSTDIR\libgstriff-0.10-0.dll"
+  Delete "$INSTDIR\libgstrtp-0.10-0.dll"
+  Delete "$INSTDIR\libgstrtsp-0.10-0.dll"
+  Delete "$INSTDIR\libgstsdp-0.10-0.dll"
+  Delete "$INSTDIR\libgsttag-0.10-0.dll"
   Delete "$INSTDIR\libgthread-2.0-0.dll"
   Delete "$INSTDIR\liblastfm.dll"
   Delete "$INSTDIR\libmms-0.dll"
@@ -886,7 +873,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libvorbis-0.dll"
   Delete "$INSTDIR\libvorbisenc-2.dll"
   Delete "$INSTDIR\libxml2-2.dll"
-  Delete "$INSTDIR\libxml2.dll"
   Delete "$INSTDIR\mingwm10.dll"
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\QtGui4.dll"
@@ -894,14 +880,13 @@ Section "Uninstall"
   Delete "$INSTDIR\QtOpenGL4.dll"
   Delete "$INSTDIR\QtSql4.dll"
   Delete "$INSTDIR\QtXml4.dll"
-  Delete "$INSTDIR\z.dll"
   Delete "$INSTDIR\zlib1.dll"
 
   Delete "$INSTDIR\imageformats\qgif4.dll"
   Delete "$INSTDIR\imageformats\qjpeg4.dll"
 
   Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstasfdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstasf.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioresample.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll"
@@ -911,7 +896,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstequalizer.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstffmpeg-gpl.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstffmpeg.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstflac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstgio.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsticydemux.dll"
@@ -921,10 +906,9 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstmms.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstqtdemux.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstreplaygain.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstspeex.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstsouphttpsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgsttypefindfunctions.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstudp.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"