diff --git a/debian/changelog b/debian/changelog
index 725af273..8c8f2f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ wine-compholio (1.7.31) UNRELEASED; urgency=low
   * Added patch with stub for KeSetSystemAffinityThread.
   * Added patch to implement DXTn support for d3dx9_36.
   * Added patch to return correct values for GetThreadTimes.
+  * Added patch to align texture dimensions to block size for compressed textures.
   * Removed patch for iphlpapi stub functions (accepted upstream).
   * Removed patches for FindFirstFileExW (accepted upstream).
   * Removed patches for TLB dependencies lookup in resources (accepted upstream).
diff --git a/patches/Makefile b/patches/Makefile
index 32d51c63..143feef7 100644
--- a/patches/Makefile
+++ b/patches/Makefile
@@ -30,6 +30,7 @@ PATCHLIST := \
 	d3dx9_36-DXTn.ok \
 	d3dx9_36-Filter_Warnings.ok \
 	d3dx9_36-GetShaderSemantics.ok \
+	d3dx9_36-Texture_Align.ok \
 	d3dx9_36-UpdateSkinnedMesh.ok \
 	dbghelp-KdHelp.ok \
 	dsound-Fast_Mixer.ok \
@@ -376,6 +377,21 @@ d3dx9_36-GetShaderSemantics.ok:
 		echo '+    { "d3dx9_36-GetShaderSemantics", "Christian Costa", "Implement D3DXGetShaderInputSemantics." },'; \
 	) > d3dx9_36-GetShaderSemantics.ok
 
+# Patchset d3dx9_36-Texture_Align
+# |
+# | Included patches:
+# |   *	Align texture dimensions to block size for compressed textures. [by Christian Costa]
+# |
+# | Modified files:
+# |   *	dlls/d3dx9_36/tests/texture.c, dlls/d3dx9_36/texture.c
+# |
+.INTERMEDIATE: d3dx9_36-Texture_Align.ok
+d3dx9_36-Texture_Align.ok:
+	$(call APPLY_FILE,d3dx9_36-Texture_Align/0001-d3dx9_36-Align-texture-dimensions-to-block-size-for-.patch)
+	@( \
+		echo '+    { "d3dx9_36-Texture_Align", "Christian Costa", "Align texture dimensions to block size for compressed textures." },'; \
+	) > d3dx9_36-Texture_Align.ok
+
 # Patchset d3dx9_36-UpdateSkinnedMesh
 # |
 # | Included patches:
diff --git a/patches/d3dx9_36-Texture_Align/0001-d3dx9_36-Align-texture-dimensions-to-block-size-for-.patch b/patches/d3dx9_36-Texture_Align/0001-d3dx9_36-Align-texture-dimensions-to-block-size-for-.patch
new file mode 100644
index 00000000..7e7a1c30
--- /dev/null
+++ b/patches/d3dx9_36-Texture_Align/0001-d3dx9_36-Align-texture-dimensions-to-block-size-for-.patch
@@ -0,0 +1,54 @@
+From e83a145da4b9e2c0c4b2b449aa72ce129344c5e5 Mon Sep 17 00:00:00 2001
+From: Christian Costa <titan.costa@gmail.com>
+Date: Tue, 4 Nov 2014 22:22:03 +0100
+Subject: d3dx9_36: Align texture dimensions to block size for compressed
+ textures in D3DXCheckTextureRequirements.
+
+---
+ dlls/d3dx9_36/tests/texture.c | 10 ++++++++++
+ dlls/d3dx9_36/texture.c       |  8 ++++----
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
+index 61132bb..11a3b92 100644
+--- a/dlls/d3dx9_36/tests/texture.c
++++ b/dlls/d3dx9_36/tests/texture.c
+@@ -374,6 +374,16 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device)
+         ok(height == 4, "Returned height %d, expected %d\n", height, 4);
+         ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1);
+         ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5);
++
++        format = D3DFMT_DXT5;
++        width = 5; height = 5;
++        mipmaps = 1;
++        hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT);
++        ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
++        ok(width == 8, "Returned width %d, expected %d\n", width, 8);
++        ok(height == 8, "Returned height %d, expected %d\n", height, 8);
++        ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1);
++        ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5);
+     }
+     else
+     {
+diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
+index 7ebe264..fa0106c 100644
+--- a/dlls/d3dx9_36/texture.c
++++ b/dlls/d3dx9_36/texture.c
+@@ -333,10 +333,10 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
+ 
+     if (fmt->block_width != 1 || fmt->block_height != 1)
+     {
+-        if (w < fmt->block_width)
+-            w = fmt->block_width;
+-        if (h < fmt->block_height)
+-            h = fmt->block_height;
++        if (w % fmt->block_width)
++            w += fmt->block_width - w % fmt->block_width;
++        if (h % fmt->block_height)
++            h += fmt->block_height - h % fmt->block_height;
+     }
+ 
+     if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w)))
+-- 
+2.1.3
+
diff --git a/patches/d3dx9_36-Texture_Align/definition b/patches/d3dx9_36-Texture_Align/definition
new file mode 100644
index 00000000..2943e625
--- /dev/null
+++ b/patches/d3dx9_36-Texture_Align/definition
@@ -0,0 +1,3 @@
+Author: Christian Costa
+Subject: Align texture dimensions to block size for compressed textures.
+Revision: 1