diff --git a/tidy/tidy.patch b/tidy/tidy.patch
index 01426ac707..980e90101a 100644
--- a/tidy/tidy.patch
+++ b/tidy/tidy.patch
@@ -1,7 +1,7 @@
 Index: build/gmake/Makefile
---- build/gmake/Makefile.orig	2014-04-13 14:06:03.952191000 +0200
-+++ build/gmake/Makefile	2014-04-13 14:06:57.072669776 +0200
-@@ -91,12 +91,12 @@
+--- build/gmake/Makefile.orig	2014-04-13 14:10:24.062275000 +0200
++++ build/gmake/Makefile	2014-04-13 14:10:43.192238254 +0200
+@@ -85,12 +85,12 @@
  # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
  # disabled.
  CC= gcc
@@ -11,8 +11,8 @@ Index: build/gmake/Makefile
  CFLAGS += -Wunused-parameter
  
  OTHERCFLAGS=
--OTHERCFLAGS+= -D_DEBUG=1
-+# OTHERCFLAGS+= -D_DEBUG=1
+-OTHERCFLAGS+= -D_DEBUG=1 -D_MSC_VER=1400
++# OTHERCFLAGS+= -D_DEBUG=1 -D_MSC_VER=1400
  # OTHERCFLAGS+= -fvisibility=hidden -DTIDY_EXPORT='__attribute__((visibility("default")))'
  ifdef SUPPORT_UTF16_ENCODINGS
  CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
diff --git a/tidy/tidy.spec b/tidy/tidy.spec
index 9859a1c326..d0529004e1 100644
--- a/tidy/tidy.spec
+++ b/tidy/tidy.spec
@@ -22,13 +22,13 @@
 ##
 
 #   package version
-%define       V_tidy 20090325
+%define       V_tidy 20120821
 %define       V_perl 1.54
 
 #   package information
 Name:         tidy
 Summary:      HTML Tidy
-URL:          http://tidy.sourceforge.net/
+URL:          http://w3c.github.io/tidy-html5/
 Vendor:       Dave Raggett
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
@@ -42,7 +42,7 @@ Release:      20140413
 %option       with_perl  no
 
 #   list of sources
-Source0:      http://download.openpkg.org/components/versioned/tidy/tidy-%{V_tidy}.tar.gz
+Source0:      http://download.openpkg.org/components/versioned/tidy/tidy-html5-%{V_tidy}.tar.gz
 Source1:      http://www.cpan.org/modules/by-module/HTML/HTML-Tidy-%{V_perl}.tar.gz
 Patch0:       tidy.patch
 
@@ -61,7 +61,7 @@ PreReq:       perl
     prog tidy:tidy = {
         version   = %{V_tidy}
         url       = http://download.openpkg.org/components/versioned/tidy/
-        regex     = tidy-(__VER__)\.tar\.gz
+        regex     = tidy-html5-(__VER__)\.tar\.gz
     }
     prog tidy:perl = {
         version   = %{V_perl}
@@ -70,9 +70,9 @@ PreReq:       perl
     }
 
 %prep
-    %setup -q -n tidy
+    %setup -q -n tidy-html5
 %if "%{with_perl}" == "yes"
-    %setup -q -n tidy -T -D -a 1
+    %setup -q -n tidy-html5 -T -D -a 1
 %endif
     %patch -p0
 
@@ -88,9 +88,9 @@ PreReq:       perl
     ) || exit $?
 %if "%{with_perl}" == "yes"
     %{l_shtool} subst \
-        -e "s;-ltidyp;-L`pwd`/../tidy/lib -ltidy;" \
-        -e "s;-I/usr/local/include/tidyp;-I`pwd`/../tidy/include;" \
-        -e "s;-I/usr/include/tidyp;-I`pwd`/../tidy/include;" \
+        -e "s;-ltidyp;-L`pwd`/../tidy-html5/lib -ltidy;" \
+        -e "s;-I/usr/local/include/tidyp;-I`pwd`/../tidy-html5/include;" \
+        -e "s;-I/usr/include/tidyp;-I`pwd`/../tidy-html5/include;" \
         HTML-Tidy-%{V_perl}/Makefile.PL
     %{l_shtool} subst \
         -e 's;tidyp.h;tidy.h;g' \