diff --git a/.cvsignore b/.cvsignore
index 98e5580..1f3459c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-easystroke-0.4.9.tar.gz
+easystroke-0.5.2.tar.gz
diff --git a/easystroke-0.5.2-timeout.patch b/easystroke-0.5.2-timeout.patch
new file mode 100644
index 0000000..9f399b4
--- /dev/null
+++ b/easystroke-0.5.2-timeout.patch
@@ -0,0 +1,14 @@
+--- me-tv-1.0.0/src/me-tv.ui
++++ me-tv-1.0.0/src/me-tv.ui
+
+--- easystroke-0.5.2/main-orig.cc	2010-01-02 17:37:03.000000000 +0100
++++ easystroke-0.5.2/main.cc		2010-01-14 11:27:08.760455955 +0100
+@@ -491,7 +491,7 @@
+ 		}
+ public:
+ 	static Handler *create(RStroke s, RTriple e, guint b1, guint b2, RPreStroke replay) {
+-		if (stroke_action)
++		if (stroke_action && s)
+ 			return new AdvancedStrokeActionHandler(s, e);
+ 		else
+ 			return new AdvancedHandler(s, e, b1, b2, replay);
diff --git a/easystroke.spec b/easystroke.spec
index ebc0027..811568a 100644
--- a/easystroke.spec
+++ b/easystroke.spec
@@ -1,5 +1,5 @@
 Name:           easystroke
-Version:        0.4.9
+Version:        0.5.2
 Release:        1%{?dist}
 Summary:        Gesture-recognition application for X11
 
@@ -7,7 +7,8 @@ Group:          User Interface/X Hardware Support
 License:        ISC
 URL:            http://easystroke.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/easystroke/%{name}-%{version}.tar.gz
-
+# Don't try to record timeouts if timeout gestures are disabled
+Patch0:         easystroke-0.5.2-timeout.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkmm24-devel
@@ -17,6 +18,8 @@ BuildRequires:  libXtst-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
+BuildRequires:  xorg-x11-server-devel >= 1.0.1
+BuildRequires:  xorg-x11-server-sdk >= 1.4.99.1
 
 %description
 Easystroke is a gesture-recognition application for X11. Gestures or strokes 
@@ -27,6 +30,7 @@ execute shell commands, hold down modifiers and emulate a scroll wheel.
 
 %prep
 %setup -q
+%patch0 -p1 -b .timeout
 # Resolve debuginfo
 sed -i 's|install -Ds|install -D|' Makefile
 # Preserve timestamps:
@@ -73,6 +77,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Jan 13 2010 Zarko Pintar <zarko.pintar@gmail.com> - 0.5.2-1
+- new version for XServer 1.7 and up
+
 * Wed Sep 09 2009 Zarko Pintar <zarko.pintar@gmail.com> - 0.4.9-1
 - new version
 
diff --git a/import.log b/import.log
index d31daf1..179ace5 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ easystroke-0_4_4-3_fc11:HEAD:easystroke-0.4.4-3.fc11.src.rpm:1243923742
 easystroke-0_4_5-1_fc10:HEAD:easystroke-0.4.5-1.fc10.src.rpm:1244061035
 easystroke-0_4_6-1_fc11:HEAD:easystroke-0.4.6-1.fc11.src.rpm:1246256369
 easystroke-0_4_9-1_fc11:HEAD:easystroke-0.4.9-1.fc11.src.rpm:1252491935
+easystroke-0_5_2-1_fc12:HEAD:easystroke-0.5.2-1.fc12.src.rpm:1263467452
diff --git a/sources b/sources
index cfd603a..6dbc7df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d95a69a29a7fb57468044df4570e665  easystroke-0.4.9.tar.gz
+3412ae807b6fa5c5fadfa8c24b6915d4  easystroke-0.5.2.tar.gz