diff --git a/Changelog b/Changelog
index 0cf051ff8..ef42159ff 100644
--- a/Changelog
+++ b/Changelog
@@ -38,6 +38,15 @@ Files:
 	include/mpxevents.h
 	include/mpxextinit.h
 
+____________________________________________________________
+xfree86: fix xf86ProcessCommonOptions() core and shared pointer assignment
+
+Files:
+	hw/xfree86/common/xf86Xinput.c
+
+TAG: mpx-0.3.0
+
+
 == 18.12.06 ==
 mi:     removing MPX ifdefs
 	global sprite renaming in mipointer and misprite
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index bf97112b4..fd2a4513a 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -124,11 +124,12 @@ _X_EXPORT void
 xf86ProcessCommonOptions(LocalDevicePtr local,
                          pointer	list)
 {
-    if (!xf86SetBoolOption(list, "AlwaysCore", 0) ||
+    if (xf86SetBoolOption(list, "AlwaysCore", 0) ||
         xf86SetBoolOption(list, "SendCoreEvents", 0) ||
         xf86SetBoolOption(list, "CorePointer", 0) ||
         xf86SetBoolOption(list, "CoreKeyboard", 0)) {
         local->flags |= XI86_ALWAYS_CORE;
+        local->flags |= XI86_SHARED_POINTER;
         xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name);
     }