diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index dd90aedc4e2..49bfdd9a8b2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2018,11 +2018,11 @@ let
   })) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.9.4";
+    name = "xorg-server-1.9.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2;
-      sha256 = "0n14xjw7gaqk4xhx7lhr387wr81yvf3cjw1wn0vjx3x5pdz084dd";
+      url = mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2;
+      sha256 = "1p19w1s840jb1ah6na0c9k23gbh9wwz1il272irqy3jggh4pbirz";
     };
     buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
   })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 6a745887ca4..5b6059cd575 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -182,7 +182,7 @@ mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2