diff --git a/10-quirks.conf b/10-quirks.conf
index b33d13f..c9b823c 100644
--- a/10-quirks.conf
+++ b/10-quirks.conf
@@ -34,3 +34,21 @@ Section "InputClass"
 	Option "ButtonMapping" "1 2 2 4 5 6 7 3 8"
 EndSection
 
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=55867
+# Bug 55867 - Doesn't know how to tag XI_TRACKBALL
+Section "InputClass"
+        Identifier "Tag trackballs as XI_TRACKBALL"
+        MatchProduct "trackball"
+        MatchDriver "evdev"
+        Option "TypeName" "TRACKBALL"
+EndSection
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=62831
+# Bug 62831 - Mionix Naos 5000 mouse detected incorrectly
+Section "InputClass"
+        Identifier "Tag Mionix Naos 5000 mouse XI_MOUSE"
+        MatchProduct "La-VIEW Technology Naos 5000 Mouse"
+        MatchDriver "evdev"
+        Option "TypeName" "MOUSE"
+EndSection
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 920d15f..45e8171 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.14.1
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Release:   4%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -595,6 +595,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.1-4
+- Update quirks for trackballs and the La-VIEW Technology Naos 5000 mouse
+
 * Sun Jun 02 2013 Adam Jackson <ajax@redhat.com> 1.14.1-3
 - Backport an arm/ppc crash fix from master (#965749)