diff --git a/synaptics/.md5sum b/synaptics/.md5sum
index a2a88c895..d7988f8da 100644
--- a/synaptics/.md5sum
+++ b/synaptics/.md5sum
@@ -1 +1,2 @@
 1102cd575045640a064ab6f9b1e391af  synaptics-0.14.6.tar.bz2
+0a537b564bcbde21c6b0c89b92e48d84  synaptics_input_api.diff
diff --git a/synaptics/Pkgfile b/synaptics/Pkgfile
index a7b0c91d9..02bcc85fe 100644
--- a/synaptics/Pkgfile
+++ b/synaptics/Pkgfile
@@ -5,11 +5,13 @@
 
 name=synaptics
 version=0.14.6
-release=2
-source=(http://web.telia.com/~u89404340/touchpad/files/$name-$version.tar.bz2)
+release=3
+source=(http://web.telia.com/~u89404340/touchpad/files/$name-$version.tar.bz2
+		${name}_input_api.diff)
 
 build() {
 	cd $name-$version
+	patch -p1 -i $SRC/${name}_input_api.diff
 	make
 	make BINDIR=$PKG/usr/bin MANDIR=$PKG/usr/man DESTDIR=$PKG install
 }
diff --git a/synaptics/synaptics_input_api.diff b/synaptics/synaptics_input_api.diff
new file mode 100644
index 000000000..f43cf0b30
--- /dev/null
+++ b/synaptics/synaptics_input_api.diff
@@ -0,0 +1,62 @@
+diff -u synaptics-0.14.6.orig/Makefile synaptics-0.14.6/Makefile
+--- synaptics-0.14.6.orig/Makefile	2006-07-15 17:58:26.000000000 +0200
++++ synaptics-0.14.6/Makefile	2007-09-07 15:03:17.386179198 +0200
+@@ -34,10 +34,9 @@
+   LDCOMBINEFLAGS = -shared -lc
+   PICFLAG = $(call check_gcc,-fPIC,)
+   X_INCLUDES_ROOT = $(INSTALLED_X)
+-  SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
+   ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
+ 		-I$(INSTALLED_X)/include/X11/extensions \
+-		-I$(SDKDIR)
++		`pkg-config xorg-server --cflags`
+ else
+   INSTALLED_X = /usr/X11R6
+   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
+diff -u synaptics-0.14.6.orig/synaptics.c synaptics-0.14.6/synaptics.c
+--- synaptics-0.14.6.orig/synaptics.c	2006-07-15 17:54:29.000000000 +0200
++++ synaptics-0.14.6/synaptics.c	2007-09-07 15:10:24.910542275 +0200
+@@ -321,7 +321,9 @@
+     local->private_flags           = 0;
+     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+     local->conf_idev               = dev;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     local->motion_history_proc     = xf86GetMotionEvents;
++#endif
+     local->history_size            = 0;
+     local->always_core_feedback    = 0;
+ 
+@@ -613,8 +615,17 @@
+ 
+     InitPointerDeviceStruct((DevicePtr)dev, map,
+ 			    SYN_MAX_BUTTONS,
+-			    miPointerGetMotionEvents, SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++			    miPointerGetMotionEvents,
++#else
++			    GetMotionHistory,
++#endif
++			    SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 			    miPointerGetMotionBufferSize());
++#else
++			    GetMotionHistorySize(), 2);
++#endif
+ 
+     /* X valuator */
+     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
+diff -u synaptics-0.14.6.orig/synaptics.h synaptics-0.14.6/synaptics.h
+--- synaptics-0.14.6.orig/synaptics.h	2006-07-15 17:54:29.000000000 +0200
++++ synaptics-0.14.6/synaptics.h	2007-09-07 15:10:12.409829887 +0200
+@@ -226,5 +226,11 @@
+ 
+ #endif /* SYNAPTICS_PRIVATE */
+ 
++/* Previously found in xf86Xinput.h */
++#ifdef DBG
++#undef DBG
++#endif
++
++#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
+ 
+ #endif /* _SYNAPTICS_H_ */