diff --git a/Packaging/Windows/CMakeLists.txt b/Packaging/Windows/CMakeLists.txt
index bfcf03a277a6892d123dd550a6eb1a17e5861390..c22fbb00155ccd39fce64319823081c3b58e2a6a 100644
--- a/Packaging/Windows/CMakeLists.txt
+++ b/Packaging/Windows/CMakeLists.txt
@@ -56,7 +56,7 @@ install(FILES ${OTB_APPS_LIST}
 
 # Retrieve the name of all the applications available
 foreach(APP ${OTB_APPS_LIST})
-    string(REPLACE ${OTB_DIR}/bin/RelWithDebInfo/ "" APP_NAME ${APP})
+    string(REPLACE ${OTB_DIR}/applications/ "" APP_NAME ${APP})
     list(APPEND OTB_APPS_NAME_LIST ${APP_NAME})
 endforeach(APP)
 
@@ -82,6 +82,15 @@ install(FILES ${OSGEO4W_ROOT}/bin/msvcp60.dll
               ${OSGEO4W_ROOT}/bin/msvcrt.dll
         DESTINATION bin
         COMPONENT Runtime)
+        
+# Since an upgrade in OSGeo4W of libpq (around 2013/10)
+# libpq depends on two additional libs that cmake
+# surprisingly miss during package generation
+# Let's add them manually
+install(FILES ${OSGEO4W_ROOT}/bin/libgcc_s_dw2-1.dll
+              ${OSGEO4W_ROOT}/bin/libiconv-2.dll
+        DESTINATION bin
+        COMPONENT Runtime)
 
 # Need to include csv files provided with OSGeo that contains some needed EPSG definitions
 find_path(GDAL_DATA epsg.wkt $ENV{GDAL_DATA})