diff --git a/configure.ac b/configure.ac
index a225259..8e284e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,10 @@ EXPEDITE_CHECK_ENGINE([software-xcb], [Software XCB], "yes")
 # XRender XCB
 EXPEDITE_CHECK_ENGINE([xrender-xcb], [XRender XCB], "yes")
 
+# GDI
+EXPEDITE_CHECK_ENGINE([software-gdi], [Software GDI], "yes", [gdi_libs="-lgdi32"])
+AC_SUBST(gdi_libs)
+
 # DirectDraw
 EXPEDITE_CHECK_ENGINE([software-ddraw], [Software DirectDraw], "yes", [ddraw_libs="-lddraw -ldxguid -lgdi32"])
 AC_SUBST(ddraw_libs)
@@ -209,6 +213,7 @@ echo "    X Render X11.................: ${have_xrender_x11}"
 echo "    Open GL X11..................: ${have_opengl_x11}"
 echo "    Software XCB.................: ${have_software_xcb}"
 echo "    X Render XCB.................: ${have_xrender_xcb}"
+echo "    Software GDI.................: ${have_software_gdi}"
 echo "    Software DirectDraw..........: ${have_software_ddraw}"
 echo "    Direct3D.....................: ${have_direct3d}"
 echo "    Open GL Glew.................: ${have_opengl_glew}"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f2a4b07..54b3ef2 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -78,7 +78,7 @@ poly_blend.c
 
 expedite_CFLAGS = @WIN32_CFLAGS@
 expedite_CXXFLAGS = -fno-rtti -fno-exceptions
-expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@ @d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ @EVIL_LIBS@ @quartz_libs@ -lm
+expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @gdi_libs@ @ddraw_libs@ @ddraw_16_libs@ @d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ @EVIL_LIBS@ @quartz_libs@ -lm
 expedite_LDFLAGS = @lt_enable_auto_import@
 
 if BUILD_SOFTWARE_X11
@@ -106,6 +106,11 @@ expedite_SOURCES += \
 engine_xrender_xcb.c engine_xrender_xcb.h
 endif
 
+if BUILD_SOFTWARE_GDI
+expedite_SOURCES += \
+engine_software_gdi.c engine_software_gdi.h
+endif
+
 if BUILD_SOFTWARE_DDRAW
 expedite_SOURCES += \
 engine_software_ddraw.cpp engine_software_ddraw.h
diff --git a/src/bin/engine_software_gdi.c b/src/bin/engine_software_gdi.c
new file mode 100644
index 0000000..545446f
--- /dev/null
+++ b/src/bin/engine_software_gdi.c
@@ -0,0 +1,296 @@
+#include "main.h"
+
+#include <windowsx.h>
+#include <Evas_Engine_Software_Gdi.h>
+
+
+static HWND window;
+
+
+static LRESULT CALLBACK
+MainWndProc(HWND   hwnd,
+            UINT   uMsg,
+            WPARAM wParam,
+            LPARAM lParam)
+{
+   switch (uMsg)
+     {
+     case WM_CREATE:
+       return 0;
+     case WM_DESTROY:
+       PostQuitMessage(0);
+       return 0;
+     case WM_CLOSE:
+       PostQuitMessage(0);
+       return 0;
+     case WM_WINDOWPOSCHANGED: {
+       PAINTSTRUCT ps;
+       HDC hdc;
+
+       hdc = BeginPaint (window, &ps);
+       evas_damage_rectangle_add(evas,
+                                 ps.rcPaint.left, ps.rcPaint.top,
+                                 ps.rcPaint.right - ps.rcPaint.left,
+                                 ps.rcPaint.bottom - ps.rcPaint.top);
+       EndPaint(window, &ps);
+       return 0;
+     }
+     case WM_SIZING:
+       {
+          PRECT rect = (PRECT)lParam;
+
+          evas_output_viewport_set(evas, 0, 0,
+                                   rect->right - rect->left,
+                                   rect->bottom - rect->top);
+          evas_output_size_set(evas,
+                               rect->right - rect->left,
+                               rect->bottom - rect->top);
+          win_w = rect->right - rect->left;
+          win_h = rect->bottom - rect->top;
+          return 0;
+       }
+     case WM_RBUTTONDOWN:
+       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
+       evas_event_feed_mouse_down(evas, 3, EVAS_BUTTON_NONE, 0, NULL);
+       return 0;
+     case WM_LBUTTONDOWN:
+       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
+       evas_event_feed_mouse_down(evas, 1, EVAS_BUTTON_NONE, 0, NULL);
+       return 0;
+     case WM_LBUTTONUP:
+       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
+       evas_event_feed_mouse_up(evas, 1, EVAS_BUTTON_NONE, 0, NULL);
+       return 0;
+     case WM_RBUTTONUP:
+       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
+       evas_event_feed_mouse_up(evas, 3, EVAS_BUTTON_NONE, 0, NULL);
+       return 0;
+     case WM_MOUSEMOVE:
+       if (!evas_pointer_inside_get(evas)) evas_event_feed_mouse_in(evas, 0, NULL);
+       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
+       return 0;
+     case WM_MOUSELEAVE:
+       evas_event_feed_mouse_out(evas, 0, NULL);
+       return 0;
+       /* FIXME : can't find an event when the mouse is entering */
+     case WM_KEYDOWN:
+     case WM_SYSKEYDOWN: {
+        int key;
+
+        key = LOWORD(wParam);
+
+        if ((key == VK_SHIFT) ||
+            (key == VK_LSHIFT) ||
+            (key == VK_RSHIFT))
+          evas_key_modifier_on(evas, "Shift");
+        if ((key == VK_CONTROL) ||
+            (key == VK_LCONTROL) ||
+            (key == VK_RCONTROL))
+          evas_key_modifier_on(evas, "Control");
+        if ((key == VK_MENU) ||
+            (key == VK_LMENU) ||
+            (key == VK_RMENU))
+          evas_key_modifier_on(evas, "Alt");
+        if ((key == VK_LWIN) ||
+            (key == VK_RWIN))
+          evas_key_modifier_on(evas, "Super");
+
+        if (key == VK_CAPITAL)
+          {
+             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Caps_Lock"))
+               evas_key_lock_off(evas, "Caps_Lock");
+             else
+               evas_key_lock_on(evas, "Caps_Lock");
+          }
+        if (key == VK_NUMLOCK)
+          {
+             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Num_Lock"))
+               evas_key_lock_off(evas, "Num_Lock");
+             else
+               evas_key_lock_on(evas, "Num_Lock");
+          }
+        if (key == VK_SCROLL)
+          {
+             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Scroll_Lock"))
+               evas_key_lock_off(evas, "Scroll_Lock");
+             else
+               evas_key_lock_on(evas, "Scroll_Lock");
+          }
+        if (key == VK_ESCAPE)
+          evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
+        if (key == VK_RETURN)
+          evas_event_feed_key_down(evas, "Return", "Return", NULL, NULL, 0, NULL);
+        if (key == VK_LEFT)
+          evas_event_feed_key_down(evas, "Left", "Left", NULL, NULL, 0, NULL);
+        if (key == VK_RIGHT)
+          evas_event_feed_key_down(evas, "Right", "Right", NULL, NULL, 0, NULL);
+        if (key == 81)
+          evas_event_feed_key_down(evas, "Q", "Q", NULL, NULL, 0, NULL);
+        if (key == 113)
+          evas_event_feed_key_down(evas, "q", "q", NULL, NULL, 0, NULL);
+        return 0;
+     }
+     case WM_KEYUP:
+     case WM_SYSKEYUP: {
+        int key;
+
+        key = LOWORD(wParam);
+
+        if ((key == VK_SHIFT) ||
+            (key == VK_LSHIFT) ||
+            (key == VK_RSHIFT))
+          evas_key_modifier_off(evas, "Shift");
+        if ((key == VK_CONTROL) ||
+            (key == VK_LCONTROL) ||
+            (key == VK_RCONTROL))
+          evas_key_modifier_off(evas, "Control");
+        if ((key == VK_MENU) ||
+            (key == VK_LMENU) ||
+            (key == VK_RMENU))
+          evas_key_modifier_off(evas, "Alt");
+        if ((key == VK_LWIN) ||
+            (key == VK_RWIN))
+          evas_key_modifier_off(evas, "Super");
+        if (key == VK_ESCAPE)
+          evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
+        if (key == VK_RETURN)
+          evas_event_feed_key_up(evas, "Return", "Return", NULL, NULL, 0, NULL);
+        if (key == VK_LEFT)
+          evas_event_feed_key_up(evas, "Left", "Left", NULL, NULL, 0, NULL);
+        if (key == VK_RIGHT)
+          evas_event_feed_key_up(evas, "Right", "Right", NULL, NULL, 0, NULL);
+        if (key == 81)
+          evas_event_feed_key_up(evas, "Q", "Q", NULL, NULL, 0, NULL);
+        if (key == 113)
+          evas_event_feed_key_up(evas, "q", "q", NULL, NULL, 0, NULL);
+        return 0;
+     }
+     default:
+       return DefWindowProc(hwnd, uMsg, wParam, lParam);
+     }
+}
+
+int
+engine_software_gdi_args(int argc, char **argv)
+{
+   WNDCLASS                       wc;
+   RECT                           rect;
+   HINSTANCE                      instance;
+   HDC                            dc;
+   Evas_Engine_Info_Software_Gdi *einfo;
+   DWORD                          style;
+   DWORD                          exstyle;
+   int                            depth;
+   int                            i;
+   int                            ok = 0;
+
+   for (i = 1; i < argc; i++)
+     {
+        if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
+          {
+             i++;
+             if (!strcmp(argv[i], "gdi")) ok = 1;
+          }
+     }
+   if (!ok) return 0;
+
+   instance = GetModuleHandle(NULL);
+   if (!instance) return 0;
+
+   wc.style = CS_HREDRAW | CS_VREDRAW;
+   wc.lpfnWndProc = MainWndProc;
+   wc.cbClsExtra = 0;
+   wc.cbWndExtra = 0;
+   wc.hInstance = instance;
+   wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+   wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+   wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
+   wc.lpszMenuName =  NULL;
+   wc.lpszClassName = "Evas_Software_Gdi_Test";
+
+   if(!RegisterClass(&wc))
+     goto free_library;
+
+   style = WS_OVERLAPPEDWINDOW | WS_SIZEBOX;
+   exstyle = 0;
+
+   rect.left = 0;
+   rect.top = 0;
+   rect.right = win_w;
+   rect.bottom = win_h;
+   AdjustWindowRectEx (&rect, style, FALSE, exstyle);
+
+   window = CreateWindowEx(exstyle,
+                           "Evas_Software_Gdi_Test",
+                           "Evas_Software_Gdi_Test",
+                           style,
+                           CW_USEDEFAULT, CW_USEDEFAULT,
+                           rect.right - rect.left, rect.bottom - rect.top,
+                           NULL, NULL, instance, NULL);
+   if (!window)
+     goto unregister_class;
+
+   /* make the window non resizable */
+   style = GetWindowLong(window, GWL_STYLE);
+   style &= ~WS_THICKFRAME;
+   if (!SetWindowLong(window, GWL_STYLE, style))
+     goto unregister_class;
+
+   dc = GetDC(NULL);
+   if (!dc)
+     goto destroy_window;
+
+   depth = GetDeviceCaps(dc, BITSPIXEL);
+   ReleaseDC(NULL, dc);
+
+   evas_output_method_set(evas, evas_render_method_lookup("software_gdi"));
+   einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(evas);
+   if (!einfo)
+     {
+        fprintf(stderr, "Evas does not support the Software GDI Engine\n");
+        goto destroy_window;
+     }
+
+   einfo->info.window = window;
+   einfo->info.mask = NULL;
+   einfo->info.depth = depth;
+   einfo->info.rotation = 0;
+   einfo->info.fullscreen = 0;
+   if (!evas_engine_info_set(evas, (Evas_Engine_Info *) einfo))
+     {
+	printf("Evas can not setup the informations of the Software GDI Engine\n");
+        goto destroy_window;
+     }
+
+   /* the second parameter is ignored, as it's the first call of ShowWindow */
+   ShowWindow(window, SW_SHOWDEFAULT);
+   UpdateWindow(window);
+
+   return 1;
+
+ destroy_window:
+   DestroyWindow(window);
+ unregister_class:
+   UnregisterClass("Evas_Software_Gdi_Test", instance);
+ free_library:
+   FreeLibrary(instance);
+
+   return 0;
+}
+
+void
+engine_software_gdi_loop(void)
+{
+   MSG msg;
+   int res;
+
+ again:
+   if (!PeekMessage (&msg, window, 0, 0, PM_NOREMOVE))
+     return;
+
+   res = GetMessage (&msg, NULL, 0, 0);
+   TranslateMessage (&msg);
+   DispatchMessage (&msg);
+
+   goto again;
+}
diff --git a/src/bin/engine_software_gdi.h b/src/bin/engine_software_gdi.h
new file mode 100644
index 0000000..c7e1695
--- /dev/null
+++ b/src/bin/engine_software_gdi.h
@@ -0,0 +1,19 @@
+#ifndef __ENGINE_SOFTWARE_GDI_H__
+#define __ENGINE_SOFTWARE_GDI_H__
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+int  engine_software_gdi_args(int argc, char **argv);
+void engine_software_gdi_loop(void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __ENGINE_SOFTWARE_GDI_H__ */
diff --git a/src/bin/main.c b/src/bin/main.c
index ab42d19..d90211e 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1219,6 +1219,10 @@ _engine_args(int argc, char **argv)
    if (engine_xrender_xcb_args(argc, argv))
      loop_func = engine_xrender_xcb_loop;
 #endif
+#if HAVE_EVAS_SOFTWARE_GDI
+   if (engine_software_gdi_args(argc, argv))
+     loop_func = engine_software_gdi_loop;
+#endif
 #if HAVE_EVAS_SOFTWARE_DDRAW
    if (engine_software_ddraw_args(argc, argv))
      loop_func = engine_software_ddraw_loop;
@@ -1289,6 +1293,9 @@ _engine_args(int argc, char **argv)
 #if HAVE_EVAS_XRENDER_XCB
 	       	" xrxcb"
 #endif
+#if HAVE_EVAS_SOFTWARE_GDI
+	       	" gdi"
+#endif
 #if HAVE_EVAS_SOFTWARE_DDRAW
 	       	" ddraw"
 #endif
diff --git a/src/bin/main.h b/src/bin/main.h
index e0a35c1..f3b7a07 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -36,6 +36,9 @@
 #if HAVE_EVAS_XRENDER_X11
 #include "engine_xrender_xcb.h"
 #endif
+#if HAVE_EVAS_SOFTWARE_GDI
+#include "engine_software_gdi.h"
+#endif
 #if HAVE_EVAS_SOFTWARE_DDRAW
 #include "engine_software_ddraw.h"
 #endif