diff --git a/dist/windows/strawberry.nsi b/dist/windows/strawberry.nsi
index b6fb87789..48eca58df 100644
--- a/dist/windows/strawberry.nsi
+++ b/dist/windows/strawberry.nsi
@@ -86,48 +86,48 @@ Function .onInit
 
 FunctionEnd
 
-;!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
- 
-Function DumpLog
-  Exch $5
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $6
- 
-  FindWindow $0 "#32770" "" $HWNDPARENT
-  GetDlgItem $0 $0 1016
-  StrCmp $0 0 exit
-  FileOpen $5 $5 "w"
-  StrCmp $5 "" exit
-    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
-    System::Alloc ${NSIS_MAX_STRLEN}
-    Pop $3
-    StrCpy $2 0
-    System::Call "*(i, i, i, i, i, i, i, i, i) i \
-      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
-    loop: StrCmp $2 $6 done
-      System::Call "User32::SendMessageA(i, i, i, i) i \
-        ($0, ${LVM_GETITEMTEXT}, $2, r1)"
-      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
-      FileWrite $5 "$4$\r$\n"
-      IntOp $2 $2 + 1
-      Goto loop
-    done:
-      FileClose $5
-      System::Free $1
-      System::Free $3
-  exit:
-    Pop $6
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-    Exch $5
+;!define LVM_GETITEMCOUNT 0x1004
+!define LVM_GETITEMTEXT 0x102D
+ 
+Function DumpLog
+  Exch $5
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $6
+ 
+  FindWindow $0 "#32770" "" $HWNDPARENT
+  GetDlgItem $0 $0 1016
+  StrCmp $0 0 exit
+  FileOpen $5 $5 "w"
+  StrCmp $5 "" exit
+    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
+    System::Alloc ${NSIS_MAX_STRLEN}
+    Pop $3
+    StrCpy $2 0
+    System::Call "*(i, i, i, i, i, i, i, i, i) i \
+      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
+    loop: StrCmp $2 $6 done
+      System::Call "User32::SendMessageA(i, i, i, i) i \
+        ($0, ${LVM_GETITEMTEXT}, $2, r1)"
+      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
+      FileWrite $5 "$4$\r$\n"
+      IntOp $2 $2 + 1
+      Goto loop
+    done:
+      FileClose $5
+      System::Free $1
+      System::Free $3
+  exit:
+    Pop $6
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+    Exch $5
 FunctionEnd
 
 ;Function RunStrawberry
@@ -168,7 +168,6 @@ Section "Strawberry" Strawberry
   File "libgstrtsp-1.0-0.dll"
   File "libgstsdp-1.0-0.dll"
   File "libgsttag-1.0-0.dll"
-  File "libgstvideo-1.0-0.dll"
   File "libharfbuzz-0.dll"
   File "libiconv-2.dll"
   File "libintl-8.dll"
@@ -233,8 +232,8 @@ Section "Strawberry" Strawberry
   ${RegisterMimeType} "audio/mpegurl" "m3u" "{cd3afa78-b84f-48f0-9393-7edc34128127}"
   ${RegisterMimeType} "application/x-wmplayer" "asx" "{cd3afa96-b84f-48f0-9393-7edc34128127}"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
 
 SectionEnd
@@ -243,8 +242,8 @@ Section "Qt Platforms" platforms
   SetOutPath "$INSTDIR\platforms"
   File "/oname=qwindows.dll" "platforms\qwindows.dll"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -253,8 +252,8 @@ Section "Qt SQL Drivers" sqldrivers
   SetOutPath "$INSTDIR\sqldrivers"
   File "/oname=qsqlite.dll" "sqldrivers\qsqlite.dll"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -265,8 +264,8 @@ Section "Qt image format plugins" imageformats
   File "/oname=qico.dll" "imageformats\qico.dll"
   File "/oname=qjpeg.dll" "imageformats\qjpeg.dll"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -306,9 +305,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
   File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
   File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
+  File "/oname=libgstcdio.dll" "gstreamer-plugins\libgstcdio.dll"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
 
 SectionEnd
@@ -332,9 +332,10 @@ Section "Xine plugins" xine-plugins
   File "/oname=xineplug_flac.dll" "xine-plugins\xineplug_flac.dll"
   File "/oname=xineplug_wavpack.dll" "xine-plugins\xineplug_wavpack.dll"
   File "/oname=xineplug_xiph.dll" "xine-plugins\xineplug_xiph.dll"
+  File "/oname=xineplug_inp_cdda.dll" "xine-plugins\xineplug_inp_cdda.dll"
 
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -348,9 +349,9 @@ Section "Xine plugins post" xine-plugins-post
   File "/oname=xineplug_post_switch.dll" "xine-plugins\post\xineplug_post_switch.dll"
   File "/oname=xineplug_post_tvtime.dll" "xine-plugins\post\xineplug_post_tvtime.dll"
   File "/oname=xineplug_post_visualizations.dll" "xine-plugins\post\xineplug_post_visualizations.dll"
-
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -363,8 +364,8 @@ Section "Start menu items" startmenu
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\strawberry.exe"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
   
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -382,8 +383,8 @@ Section "Uninstaller"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 
-  StrCpy $0 "$EXEDIR\install.log"
-  Push $0
+  StrCpy $0 "$EXEDIR\install.log"
+  Push $0
   Call DumpLog
   
 SectionEnd
@@ -413,9 +414,9 @@ Section "Uninstall"
   ;completed:
 
   ; Delete all the files
-  
-  ;Delete "$EXEDIR\install.log"
-  
+
+  ;Delete "$EXEDIR\install.log"
+
   Delete "$INSTDIR\strawberry.ico"
   Delete "$INSTDIR\strawberry.exe"
   Delete "$INSTDIR\strawberry-tagreader.exe"
@@ -444,7 +445,6 @@ Section "Uninstall"
   Delete "$INSTDIR\libgstrtsp-1.0-0.dll"
   Delete "$INSTDIR\libgstsdp-1.0-0.dll"
   Delete "$INSTDIR\libgsttag-1.0-0.dll"
-  Delete "$INSTDIR\libgstvideo-1.0-0.dll"
   Delete "$INSTDIR\libharfbuzz-0.dll"
   Delete "$INSTDIR\libiconv-2.dll"
   Delete "$INSTDIR\libintl-8.dll"
@@ -518,6 +518,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstcdio.dll"
 
   Delete "$INSTDIR\xine-plugins\xineplug_ao_out_directx2.dll"
   Delete "$INSTDIR\xine-plugins\xineplug_ao_out_directx.dll"
@@ -536,6 +537,7 @@ Section "Uninstall"
   Delete "$INSTDIR\xine-plugins\xineplug_flac.dll"
   Delete "$INSTDIR\xine-plugins\xineplug_wavpack.dll"
   Delete "$INSTDIR\xine-plugins\xineplug_xiph.dll"
+  Delete "$INSTDIR\xine-plugins\xineplug_inp_cdda.dll"
 
   Delete "$INSTDIR\xine-plugins\post\xineplug_post_audio_filters.dll"
   Delete "$INSTDIR\xine-plugins\post\xineplug_post_goom.dll"