diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 136d73e2a38..a231a5046af 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -2441,6 +2441,11 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
                                                 Value);
             break;
 
+        case D3DRENDERSTATE_BORDERCOLOR:
+            FIXME("Unhandled render state D3DRENDERSTATE_BORDERCOLOR.\n");
+            hr = E_NOTIMPL;
+            break;
+
         default:
             /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
             hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice,
@@ -2723,6 +2728,13 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
                                                 Value);
             break;
 
+        case D3DRENDERSTATE_BORDERCOLOR:
+            /* This should probably just forward to the corresponding sampler
+             * state. Needs tests. */
+            FIXME("Unhandled render state D3DRENDERSTATE_BORDERCOLOR.\n");
+            hr = E_NOTIMPL;
+            break;
+
         default:
 
             /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index f343a3641d2..048cf77fffc 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1873,13 +1873,6 @@ static void state_stippleenable(DWORD state, IWineD3DStateBlockImpl *stateblock,
     }
 }
 
-static void state_bordercolor(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)
-{
-    if(stateblock->renderState[WINED3DRS_BORDERCOLOR]) {
-        FIXME("Render state WINED3DRS_BORDERCOLOR not implemented yet\n");
-    }
-}
-
 static void state_mipmaplodbias(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)
 {
     if(stateblock->renderState[WINED3DRS_MIPMAPLODBIAS]) {
@@ -5528,7 +5521,6 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
     { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT),         { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl          }, WINED3D_GL_EXT_NONE             },
     { STATE_PIXELSHADER,                                  { STATE_PIXELSHADER,                                  apply_pixelshader   }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE),            { STATE_PIXELSHADER,                                  NULL                }, WINED3D_GL_EXT_NONE             },
-    { STATE_RENDER(WINED3DRS_BORDERCOLOR),                { STATE_RENDER(WINED3DRS_BORDERCOLOR),                state_bordercolor   }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3DRS_TEXTUREFACTOR),              { STATE_RENDER(WINED3DRS_TEXTUREFACTOR),              state_texfactor     }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3DRS_FOGCOLOR),                   { STATE_RENDER(WINED3DRS_FOGCOLOR),                   state_fogcolor      }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3DRS_FOGDENSITY),                 { STATE_RENDER(WINED3DRS_FOGDENSITY),                 state_fogdensity    }, WINED3D_GL_EXT_NONE             },
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index b879f7a8585..363bf4b30e8 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1533,7 +1533,6 @@ const char* debug_d3drenderstate(DWORD state) {
     D3DSTATE_TO_STR(WINED3DRS_STIPPLEENABLE             );
     D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS             );
     D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE            );
-    D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR               );
     D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS             );
     D3DSTATE_TO_STR(WINED3DRS_ZBIAS                     );
     D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE            );
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index d6068f024e7..ede80ad8102 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -315,7 +315,6 @@ typedef enum _WINED3DRENDERSTATETYPE
     WINED3DRS_STIPPLEENABLE                 = 39, /* d3d7 */
     WINED3DRS_EDGEANTIALIAS                 = 40, /* d3d7, d3d8 */
     WINED3DRS_COLORKEYENABLE                = 41, /* d3d7 */
-    WINED3DRS_BORDERCOLOR                   = 43, /* d3d7 */
     WINED3DRS_MIPMAPLODBIAS                 = 46, /* d3d7 */
     WINED3DRS_ZBIAS                         = 47, /* d3d7, d3d8 */
     WINED3DRS_RANGEFOGENABLE                = 48,