diff --git a/system/devel/xorg-proto/actions.py b/system/devel/xorg-proto/actions.py
index 24b007ed..5f557ae9 100644
--- a/system/devel/xorg-proto/actions.py
+++ b/system/devel/xorg-proto/actions.py
@@ -8,32 +8,21 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
-WorkDir = "."
-SkipFiles = [".pc", "filelist", "patches", "pisiBuildState"]
-
 def setup():
-    pisitools.dosed("*/Makefile.am", r"/doc/\$\(PACKAGE\)", "/doc/xorg-proto")
-
-    for package in shelltools.ls("."):
-        if package in SkipFiles:
-            continue
-        shelltools.cd(package)
-        autotools.autoreconf("-vif")
-        autotools.configure("--without-xmlto --without-fop")
-        shelltools.cd("../")
-
+    shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.in")
+    shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.am")
+    
+    autotools.autoreconf("-vif")
+    autotools.configure("--prefix=/usr \
+                         --docdir=/usr/share/doc/xorg-proto")
+    
 def build():
-    for package in shelltools.ls("."):
-        if package in SkipFiles:
-            continue
-        shelltools.cd(package)
-        autotools.make()
-        shelltools.cd("../")
-
+    autotools.make()
+    
 def install():
-    for package in shelltools.ls("."):
-        if package in SkipFiles:
-            continue
-        shelltools.cd(package)
-        autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-        shelltools.cd("../")
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+        
+        
+    pisitools.dodoc("README", "COPYING*", "AUTHORS")
+    pisitools.domove("/usr/share/doc/xorg-proto/COPYING-*o","/usr/share/doc/xorg-proto/COPYING")
+    
diff --git a/system/devel/xorg-proto/pspec.xml b/system/devel/xorg-proto/pspec.xml
index d5647ba0..f306d0b1 100644
--- a/system/devel/xorg-proto/pspec.xml
+++ b/system/devel/xorg-proto/pspec.xml
@@ -12,41 +12,13 @@
         <IsA>library</IsA>
         <Summary>X.Org Protocol Headers</Summary>
         <Description>This package includes the protocol headers needed for X11 development.</Description>
-        <Archive sha1sum="ef1765eeb5e9e38d080225fe6a64ed7cd2984b46" type="tarbz2">mirrors://xorg/individual/proto/bigreqsproto-1.1.2.tar.bz2</Archive>
-        <Archive sha1sum="432371cdc464881029c3f39f9bf81cc80a484e54" type="tarbz2">mirrors://xorg/individual/proto/presentproto-1.0.tar.bz2</Archive>
-        <Archive sha1sum="aa7b5abcfd5bbfad7cb681ce89dc1d6e381e3044" type="tarbz2">mirrors://xorg/individual/proto/compositeproto-0.4.2.tar.bz2</Archive>
-        <Archive sha1sum="bd0f0f4dc8f37eaabd9279d10fe2889710507358" type="tarbz2">mirrors://xorg/individual/proto/damageproto-1.2.1.tar.bz2</Archive>
-        <Archive sha1sum="3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91" type="tarbz2">mirrors://xorg/individual/proto/dmxproto-2.3.1.tar.bz2</Archive>
-        <Archive sha1sum="2bc4e8f00778b1f3fe58b4c4f93607ac2adafbbf" type="tarbz2">mirrors://xorg/individual/proto/dri2proto-2.8.tar.bz2</Archive>
-        <Archive sha1sum="1007eaa2f83022653a224f7d2e676ea51cba2f2b" type="tarbz2">mirrors://xorg/individual/proto/dri3proto-1.0.tar.bz2</Archive>
-        <Archive sha1sum="ab605af5da8c98c0c2f8b2c578fed7c864ee996a" type="tarbz2">mirrors://xorg/individual/proto/fixesproto-5.0.tar.bz2</Archive>
-        <Archive sha1sum="28c108bd6438c332122c10871c1fc6415591755f" type="tarbz2">mirrors://xorg/individual/proto/fontsproto-2.1.3.tar.bz2</Archive>
-        <Archive sha1sum="20e061c463bed415051f0f89e968e331a2078551" type="tarbz2">mirrors://xorg/individual/proto/glproto-1.4.17.tar.bz2</Archive>
-        <Archive sha1sum="62b29a0c3b4ede9d129a0598cc6becf628a2158a" type="tarbz2">mirrors://xorg/individual/proto/inputproto-2.3.2.tar.bz2</Archive>
-        <Archive sha1sum="29fa217174fcdc9e27cba5663357989ef6e381a0" type="targz">mirrors://xorg/individual/proto/kbproto-1.0.7.tar.gz</Archive><!--1-->
-        <Archive sha1sum="4ddb7781ebc2418d681a6f5e16d777aed56ea35e" type="tarbz2">mirrors://xorg/individual/proto/printproto-1.0.5.tar.bz2</Archive>
-        <Archive sha1sum="d78ab1532d5381cacce59866ce331c7f806ad215" type="targz">mirrors://xorg/individual/proto/randrproto-1.5.0.tar.gz</Archive><!--2-->
-        <Archive sha1sum="1f48c4b0004d8b133efd0498e8d88d68d3b9199c" type="tarbz2">mirrors://xorg/individual/proto/recordproto-1.14.2.tar.bz2</Archive>
-        <Archive sha1sum="7ae9868a358859fe539482b02414aa15c2d8b1e4" type="tarbz2">mirrors://xorg/individual/proto/renderproto-0.11.1.tar.bz2</Archive>
-        <Archive sha1sum="9ff9bb9243b0474330959dc3853973523c9dd9ce" type="tarbz2">mirrors://xorg/individual/proto/resourceproto-1.2.0.tar.bz2</Archive>
-        <Archive sha1sum="640a2cbef5893aacda74799e6fa4d973e629b753" type="tarbz2">mirrors://xorg/individual/proto/scrnsaverproto-1.2.2.tar.bz2</Archive>
-        <Archive sha1sum="4556b5c2243a2ca290ea2140dc1a427c4bac8ba2" type="tarbz2">mirrors://xorg/individual/proto/videoproto-2.3.3.tar.bz2</Archive>
-        <Archive sha1sum="59ae9ec6414964440bf654b207618e5dd66a32fb" type="tarbz2">mirrors://xorg/individual/proto/xcmiscproto-1.2.2.tar.bz2</Archive>
-        <Archive sha1sum="b8d736342dcb73b71584d99a1cb9806d93c25ff8" type="tarbz2">mirrors://xorg/individual/proto/xextproto-7.3.0.tar.bz2</Archive>
-        <Archive sha1sum="312a2ea708b257520c1af4393b69d73a393a478f" type="tarbz2">mirrors://xorg/individual/proto/xf86bigfontproto-1.2.0.tar.bz2</Archive>
-        <Archive sha1sum="97a06120e7195c968875e8ba42e82c90ab54948b" type="tarbz2">mirrors://xorg/individual/proto/xf86dgaproto-2.1.tar.bz2</Archive>
-        <Archive sha1sum="23e861f40ba0f0cbbfd7db7ba2ef623762ffca17" type="tarbz2">mirrors://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2</Archive>
-        <Archive sha1sum="11d54c3210887631ea71e8f8030a77692e964fc4" type="tarbz2">mirrors://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2</Archive>
-        <Archive sha1sum="818bffc16139d6e3de4344c83f00c495d3536753" type="tarbz2">mirrors://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2</Archive>
-        <Archive sha1sum="f496ce16048c0b6b854fd6aefd6efb183eb61822" type="targz">mirrors://xorg/individual/proto/xproto-7.0.31.tar.gz</Archive><!--3-->
-        <Archive sha1sum="4abb036371670ecc25d32e48b3277fe203ae5203" type="tarbz2">mirrors://xorg/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2</Archive>
-        <Archive sha1sum="90f8600fb06c0c347551ad7096ef50492d86ba45" type="tarbz2">https://github.com/bbidulock/vncproto/releases/download/vncproto-1.1/vncproto-1.1.tar.bz2</Archive>
+        <Archive sha1sum="2e4a3db312e1ce81e15515dfcac52ba0aa5a920c" type="tarbz2">mirrors://xorg/individual/proto/xorgproto-2018.4.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>util-macros</Dependency>
             <Dependency>libxslt</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">docdir.patch</Patch>
+<!--             <Patch level="1">docdir.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -65,6 +37,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2018-09-11</Date>
+            <Version>2018.4</Version>
+            <Comment>First release</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2018-07-15</Date>
             <Version>7.6</Version>