diff --git a/Makefile.common b/Makefile.common
index 74078a2177..be0070ef2e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -148,7 +148,6 @@ OBJ += frontend/frontend.o \
 		libretro-common/gfx/scaler/pixconv.o \
 		libretro-common/gfx/scaler/scaler_int.o \
 		libretro-common/gfx/scaler/scaler_filter.o \
-		gfx/image/image_rpng.o \
 		gfx/font_renderer_driver.o \
 		gfx/video_filter.o \
 		audio/audio_resampler_driver.o \
@@ -167,6 +166,11 @@ OBJ += frontend/frontend.o \
 		record/record_driver.o \
 		performance.o
 
+OBJ += gfx/image/image_rpng.o
+
+#OBJ += gfx/image/image_mpng.o \
+		 libretro-common/formats/mpng/mpng_decode.o
+
 # LibretroDB
 
 ifeq ($(HAVE_LIBRETRODB), 1)
diff --git a/gfx/image/image_mpng.c b/gfx/image/image_mpng.c
new file mode 100644
index 0000000000..41c1e2df09
--- /dev/null
+++ b/gfx/image/image_mpng.c
@@ -0,0 +1,93 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include "image.h"
+#include "../../file_ops.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+#include "../../general.h"
+#include <formats/mpng.h>
+#include <file/nbio.h>
+
+void texture_image_free(struct texture_image *img)
+{
+   if (!img)
+      return;
+
+   free(img->pixels);
+   memset(img, 0, sizeof(*img));
+}
+
+
+bool texture_image_load_file(struct nbio_t* read,
+      void *ptr, const char *path, size_t *len)
+{
+   bool looped = false;
+   ptr = nbio_get_ptr(read, len);
+
+   if (*len != 1024*1024)
+      RARCH_ERR("ERROR: wrong size (2).\n");
+   if (ptr)
+      RARCH_WARN("Read pointer is available before iterating?\n");
+
+   nbio_begin_read(read);
+
+   while (!nbio_iterate(read))
+      looped=true;
+
+   if (!looped)
+      RARCH_LOG("Read finished immediately?\n");
+
+   ptr = nbio_get_ptr(read, len);
+
+   if (*len != 1024*1024)
+      puts("ERROR: wrong size (3)");
+   if (*(char*)ptr != 0x42 || memcmp(ptr, (char*)ptr+1, 1024*1024-1))
+      puts("ERROR: wrong data");
+
+
+   return true;
+}
+
+bool texture_image_load(struct texture_image *out_img, const char *path)
+{
+   size_t len;
+   void *ptr = NULL;
+   struct mpng_image img = {0};
+   struct nbio_t* read = nbio_open(path, NBIO_READ);
+
+   if (!read)
+      return false;
+
+   texture_image_load_file(read, ptr, path, &len);
+
+   if (!png_decode(ptr, len, &img, FMT_ARGB8888))
+      return false;
+
+   out_img->width  = img.width;
+   out_img->height = img.height;
+   out_img->pixels = img.pixels;
+
+   nbio_free(read);
+
+   return true;
+}