diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
index 8daf33b52e..1e7b7ca8df 100644
--- a/cmake/SelectPcsx2Plugins.cmake
+++ b/cmake/SelectPcsx2Plugins.cmake
@@ -5,7 +5,7 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), aio")
 set(msg_dep_pcsx2       "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
 set(msg_dep_cdvdiso     "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)")
 set(msg_dep_zerogs      "check these libraries -> glew (>=1.6), opengl, X11, nvidia-cg-toolkit (>=2.1)")
-set(msg_dep_gsdx        "check these libraries -> opengl, egl, X11")
+set(msg_dep_gsdx        "check these libraries -> opengl, png++, X11")
 set(msg_dep_onepad      "check these libraries -> sdl (>=1.2), X11")
 set(msg_dep_spu2x       "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), sdl (>=1.2) pcsx2 common libs")
 set(msg_dep_zerospu2    "check these libraries -> soundtouch (>=1.5), alsa")
@@ -144,12 +144,12 @@ endif()
 # requires: -OpenGL
 #			-X11
 #---------------------------------------
-if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
+if(OPENGL_FOUND AND X11_FOUND AND PNGPP_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
     set(GSdx TRUE)
 elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
-	set(GSdx FALSE)
+    set(GSdx FALSE)
 else()
-	set(GSdx FALSE)
+    set(GSdx FALSE)
     message(STATUS "Skip build of GSdx: miss some dependencies")
     message(STATUS "${msg_dep_gsdx}")
 endif()
diff --git a/debian-packager/control b/debian-packager/control
index b566f6b895..8d73047c96 100644
--- a/debian-packager/control
+++ b/debian-packager/control
@@ -12,6 +12,7 @@ Build-Depends: cmake (>= 2.8.5),
     libglew-dev,
     libglu1-mesa-dev,
     libgtk2.0-dev (>= 2.16),
+    libpng++-dev,
     libpulse-dev,
     libsdl1.2-dev,
     libsoundtouch-dev,
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 41abfb1f2d..2e4c8b8a90 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -36,10 +36,6 @@ if(XDG_STD)
     set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD)
 endif()
 
-if(PNGPP_FOUND)
-    set(GSdxFinalFlags ${GSdxFinalFlags} -DPNGPP_SUPPORTED)
-endif()
-
 if(EGL_API AND EGL_FOUND)
     set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED)
 endif()
@@ -88,6 +84,7 @@ set(GSdxSources
     GSLinuxDialog.cpp
     GSLocalMemory.cpp
     GSPerfMon.cpp
+    GSPng.cpp
     GSRasterizer.cpp
     GSRenderer.cpp
     GSRendererCL.cpp
@@ -202,9 +199,10 @@ set(GSdxFinalLibs
 )
 
 set(GSdxFinalLibs ${GSdxFinalLibs}
-	${OPENGL_LIBRARIES}
+    ${OPENGL_LIBRARIES}
     ${GTK2_LIBRARIES}
     ${LIBC_LIBRARIES}
+    "-lpng"  # yes it sucks
 )
 
 if(EGL_API AND EGL_FOUND)
@@ -213,11 +211,6 @@ if(EGL_API AND EGL_FOUND)
         )
 endif()
 
-if(PNGPP_FOUND)
-	set(GSdxFinalLibs ${GSdxFinalLibs}
-		"-lpng")
-endif()
-
 # Generate Glsl header file. Protect with REBUILD_SHADER to avoid build-dependency on PERL
 if (REBUILD_SHADER)
     add_custom_command(OUTPUT res/glsl_source.h COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/glsl2h.pl)