diff --git a/src/install/meshlab.nsi b/src/install/meshlab.nsi
index aed6b26b5..3175c5a36 100644
--- a/src/install/meshlab.nsi
+++ b/src/install/meshlab.nsi
@@ -58,10 +58,14 @@ Section "MainSection" SEC01
   File "..\meshlab\shaders\*.gdp"
   File "..\meshlab\shaders\*.vert"
   SetOutPath "$INSTDIR\plugins"
+  File "..\meshlab\plugins\epoch_io.dll"
+  File "..\meshlab\plugins\colladaio.dll"
   File "..\meshlab\plugins\meshio.dll"
   File "..\meshlab\plugins\meshselect.dll"
   File "..\meshlab\plugins\meshrender.dll"
+  File "..\meshlab\plugins\meshdecorate.dll"
   File "..\meshlab\plugins\meshfilter.dll"
+  File "..\meshlab\plugins\cleanfilter.dll"
   File "..\meshlab\plugins\meshedit.dll"
   File "..\meshlab\plugins\meshcolorize.dll"
   SetOutPath "$INSTDIR\textures"
@@ -72,16 +76,21 @@ Section "MainSection" SEC01
   File "..\sample\texturedknot.mtl"
   File "..\sample\TextureDouble_A.png"
   File "..\sample\Laurana50k.ply"
+  File "..\sample\duck_triangulate.dae"
+  SetOutPath "$INSTDIR\samples\images"
+  File "..\sample\images\duckCM.jpg"
   SetOutPath "$INSTDIR\imageformats"
-  File "$QT_BASE\plugins\imageformats\qjpeg1.dll"
+  File ${QT_BASE}\plugins\imageformats\qjpeg1.dll
   SetOutPath "$INSTDIR"
-  File "$QT_BASE\bin\QtCore4.dll"
-  File "$QT_BASE\bin\QtGui4.dll"
-  File "$QT_BASE\bin\QtOpenGL4.dll"
-  File "$QT_BASE\bin\QtXml4.dll"
-  File "$QT_BASE\bin\QtNetwork4.dll"
+  File "${QT_BASE}\bin\QtCore4.dll"
+  File "${QT_BASE}\bin\QtGui4.dll"
+  File "${QT_BASE}\bin\QtOpenGL4.dll"
+  File "${QT_BASE}\bin\QtXml4.dll"
+  File "${QT_BASE}\bin\QtNetwork4.dll"
   File "C:\MinGW\bin\mingwm10.dll"
-  File "..\docs\readme.txt"
+  File "..\..\docs\readme.txt"
+  File "..\..\docs\history.txt"
+  File "..\..\docs\gpl.txt"
 SectionEnd
 
 Section -AdditionalIcons
@@ -115,11 +124,14 @@ FunctionEnd
 Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\qt*.dll"
-  Delete "$INSTDIR\meshlab.exe"
+  Delete "$INSTDIR\*.txt"
+  Delete "$INSTDIR\ming*.dll"
+  Delete "$INSTDIR\*.exe"
   Delete "$INSTDIR\shaders\*.frag"
   Delete "$INSTDIR\shaders\*.vert"
   Delete "$INSTDIR\shaders\*.gdp"
   Delete "$INSTDIR\samples\*.*"
+  Delete "$INSTDIR\samples\images\*.*"
   Delete "$INSTDIR\plugins\*.dll"
   Delete "$INSTDIR\imageformats\*.dll"
   Delete "$INSTDIR\textures\*.png"
@@ -131,6 +143,12 @@ Section Uninstall
 
   RMDir "$SMPROGRAMS\MeshLab"
   RMDir "$INSTDIR\CVS"
+  RMDir "$INSTDIR\imageformats"
+  RMDir "$INSTDIR\plugins"
+  RMDir "$INSTDIR\samples\images"
+  RMDir "$INSTDIR\samples"
+  RMDir "$INSTDIR\textures"
+  RMDir "$INSTDIR\shaders"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"