diff --git a/pipi/Makefile.am b/pipi/Makefile.am
index 094c8bd..91876c0 100644
--- a/pipi/Makefile.am
+++ b/pipi/Makefile.am
@@ -112,6 +112,11 @@ codec_libs += -lgdi32
 codec_sources += codec/gdi.c
 endif
 
+if USE_GDIPLUS
+codec_libs += -lgdiplus
+codec_sources += codec/gdiplus.cpp
+endif
+
 if USE_COCOA
 codec_objcflags = -I"/Developer//SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QuartzCore.framework/Versions/A/Headers/"
 codec_libs += -framework Cocoa -framework IOKit -framework CoreFoundation -framework QuartzCore
diff --git a/pipi/codec.c b/pipi/codec.c
index f5d93f9..0d18eed 100644
--- a/pipi/codec.c
+++ b/pipi/codec.c
@@ -98,6 +98,10 @@ int pipi_save(pipi_image_t *img, const char *name)
     if(ret < 0)
         ret = pipi_save_gdi(img, name);
 #endif
+#if USE_GDIPLUS
+    if(ret < 0)
+        ret = pipi_save_gdiplus(img, name);
+#endif
 #if USE_COCOA
     if(ret < 0)
         ret = pipi_save_coreimage(img, name);
diff --git a/pipi/codec/gdiplus.cpp b/pipi/codec/gdiplus.cpp
new file mode 100755
index 0000000..2f80568
--- /dev/null
+++ b/pipi/codec/gdiplus.cpp
@@ -0,0 +1,144 @@
+/*
+ *  libpipi       Pathetic image processing interface library
+ *  Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
+ *                All Rights Reserved
+ *
+ *  $Id$
+ *
+ *  This library is free software. It comes without any warranty, to
+ *  the extent permitted by applicable law. You can redistribute it
+ *  and/or modify it under the terms of the Do What The Fuck You Want
+ *  To Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
+ */
+
+/*
+ * gdi.c: Windows GDI I/O functions (BMP only)
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include "pipi.h"
+#include "pipi_internals.h"
+
+extern "C" pipi_image_t *pipi_load_gdiplus(const char *name)
+{
+    BITMAPINFO binfo;
+    pipi_image_t *img;
+    pipi_pixels_t *p;
+    uint8_t *data;
+    HBITMAP hbmap;
+    HDC hdc;
+
+    hbmap = (HBITMAP)LoadImage(NULL, name, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+    if(!hbmap)
+        return NULL;
+
+    hdc = CreateCompatibleDC(NULL);
+    SelectObject(hdc, hbmap);
+
+    memset(&binfo, 0, sizeof(binfo));
+    binfo.bmiHeader.biSize = sizeof(binfo.bmiHeader);
+    if(!GetDIBits(hdc, hbmap, 0, 0, 0, &binfo, DIB_RGB_COLORS))
+    {
+        ReleaseDC(0, hdc);
+        DeleteObject(hbmap);
+        return NULL;
+    }
+
+    img = pipi_new(binfo.bmiHeader.biWidth, binfo.bmiHeader.biHeight);
+    p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
+    data = (uint8_t *)p->pixels;
+
+    binfo.bmiHeader.biBitCount = 32;
+    binfo.bmiHeader.biCompression = BI_RGB;
+    binfo.bmiHeader.biHeight = - abs(binfo.bmiHeader.biHeight);
+    if(!GetDIBits(hdc, hbmap, 0, abs(binfo.bmiHeader.biHeight), data,
+                  &binfo, DIB_RGB_COLORS))
+    {
+        ReleaseDC(0, hdc);
+        DeleteObject(hbmap);
+        return NULL;
+    }
+
+    /* FIXME: do we need to swap bytes? Apparently Vista doesn't need it,
+     * but we'd need a more thorough test. */
+
+    img->codec_priv = NULL;
+
+    img->wrap = 0;
+    img->u8 = 1;
+
+    ReleaseDC(0, hdc);
+    DeleteObject(hbmap);
+
+    return img;
+}
+
+extern "C" int pipi_save_gdiplus(pipi_image_t *img, const char *name)
+{
+    BITMAPINFOHEADER binfo;
+    BITMAPFILEHEADER bfheader;
+    uint8_t dummy[4] = { 0 };
+    HANDLE hfile;
+    pipi_pixels_t *p;
+    DWORD ret = 0;
+    uint8_t *data;
+    int x, y, padding;
+
+    p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
+    data = (uint8_t *)p->pixels;
+
+    padding = ((img->w * 3) + 3) / 4 * 4 - img->w * 3;
+
+    memset(&binfo, 0, sizeof(binfo));
+    binfo.biSize = sizeof(binfo);
+    binfo.biWidth = img->w;
+    binfo.biHeight = img->h;
+    binfo.biPlanes = 1;
+    binfo.biBitCount = 24;
+    binfo.biCompression = BI_RGB;
+    binfo.biSizeImage = (img->w * 3 + padding) * img->h;
+
+    memset(&bfheader, 0, sizeof(bfheader));
+    bfheader.bfType = 0x4D42;
+    bfheader.bfOffBits = sizeof(bfheader) + sizeof(binfo);
+    bfheader.bfSize = bfheader.bfOffBits + binfo.biSizeImage;
+
+    /* We don’t even create the bitmap object, since we know exactly
+     * what kind of file we are saving. But later, when we support
+     * different depths and BMP options, we'll need to care about it. */
+    hfile = CreateFile(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                       FILE_ATTRIBUTE_ARCHIVE, NULL);
+    if(!hfile)
+        return -1;
+    WriteFile(hfile, &bfheader, sizeof(bfheader), &ret, NULL);
+    WriteFile(hfile, &binfo, sizeof(binfo), &ret, NULL);
+    for(y = 0; y < img->h; y++)
+    {
+        for(x = 0; x < img->w; x++)
+        {
+            uint8_t tmp[3];
+            tmp[0] = data[4 * (img->w * (img->h - 1 - y) + x) + 0];
+            tmp[1] = data[4 * (img->w * (img->h - 1 - y) + x) + 1];
+            tmp[2] = data[4 * (img->w * (img->h - 1 - y) + x) + 2];
+            WriteFile(hfile, tmp, 3, &ret, NULL);
+        }
+        if(padding)
+            WriteFile(hfile, dummy, padding, &ret, NULL);
+    }
+    CloseHandle(hfile);
+
+    return 0;
+}
+
+/*
+ * XXX: The following functions are local.
+ */
+
diff --git a/pipi/libpipi.vcproj b/pipi/libpipi.vcproj
index f2d7282..8f9665f 100644
--- a/pipi/libpipi.vcproj
+++ b/pipi/libpipi.vcproj
@@ -271,6 +271,10 @@
 				RelativePath=".\codec\gdi.c"
 				>
 			</File>
+			<File
+				RelativePath=".\codec\gdiplus.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\histogram\histogram.c"
 				>
diff --git a/win32/config.h b/win32/config.h
index e068feb..17f139d 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -41,6 +41,7 @@
 /* #undef USE_OPENCV */
 /* #undef USE_IMLIB2 */
 #define USE_GDI 1
+#define USE_GDIPLUS 1
 /* #undef USE_COCOA */
 /* #undef const */
 #ifndef __cplusplus