diff --git a/distribution.xml b/distribution.xml
index 19bece4c84..29b1fde20b 100644
--- a/distribution.xml
+++ b/distribution.xml
@@ -401,5 +401,6 @@
         <Package>xorg-video-fglrx</Package>
         <Package>xorg-video-fglrx-32bit</Package>
         <Package>glibc-32bit</Package>
+        <Package>xf86-input-aiptek</Package>
     </Obsoletes>
 </PISI>
diff --git a/x11/driver/xorg-input-aiptek/actions.py b/x11/driver/xorg-input-aiptek/actions.py
deleted file mode 100644
index fe8ec0802b..0000000000
--- a/x11/driver/xorg-input-aiptek/actions.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/copyleft/gpl.txt.
-
-from pisi.actionsapi import get
-from pisi.actionsapi import autotools
-from pisi.actionsapi import pisitools
-
-def setup():
-    #autotools.autoreconf("-fiv")
-    autotools.configure("\
-                         --disable-static \
-                         --disable-silent-rules \
-                        ")
-
-def build():
-    autotools.make()
-
-def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.dodoc("COPYING", "ChangeLog", "README")
diff --git a/x11/driver/xorg-input-aiptek/pspec.xml b/x11/driver/xorg-input-aiptek/pspec.xml
deleted file mode 100644
index b4aba48175..0000000000
--- a/x11/driver/xorg-input-aiptek/pspec.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
-<PISI>
-    <Source>
-        <Name>xorg-input-aiptek</Name>
-        <Homepage>http://www.x.org</Homepage>
-        <Packager>
-            <Name>PisiLinux Community</Name>
-            <Email>admins@pisilinux.org</Email>
-        </Packager>
-        <License>MIT</License>
-        <IsA>driver</IsA>
-        <Summary>X.Org Aiptek USB Digital Tablet input driver</Summary>
-        <Description>xorg-input-aiptek contains the X.Org driver for Linux's generic event devices. It supports all input devices that the kernel knows about.</Description>
-        <Archive sha1sum="55ea7d12d3e24fd72eacc966a59262864dce7769" type="tarbz2">mirrors://xorg/individual/driver/xf86-input-aiptek-1.4.1.tar.bz2</Archive>
-        <BuildDependencies>
-            <Dependency>libX11-devel</Dependency>
-            <Dependency>libmtdev-devel</Dependency>
-            <Dependency>util-macros</Dependency>
-            <Dependency>xorg-proto</Dependency>
-            <Dependency>xorg-server-devel</Dependency>
-            <Dependency>libinput-devel</Dependency>
-            <Dependency>libXi-devel</Dependency>
-        </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>xorg-input-aiptek</Name>
-        <!--RuntimeDependencies>
-            <Dependency>xorg-server</Dependency>
-            <Dependency>libmtdev</Dependency>
-        </RuntimeDependencies-->
-        <Files>
-            <Path fileType="library">/usr/lib/xorg</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="man">/usr/share/man</Path>
-        </Files>
-    </Package>
-
-    <History>
-        <Update release="2">
-            <Date>2016-05-02</Date>
-            <Version>1.4.1</Version>
-            <Comment>Rebuild</Comment>
-            <Name>Burak Ertürk</Name>
-            <Email>burakerturk@pisilinux.org</Email>
-        </Update>
-        <Update release="1">
-            <Date>2015-05-08</Date>
-            <Version>1.4.1</Version>
-            <Comment>First release</Comment>
-            <Name>Burak Ertürk</Name>
-            <Email>burakerturk@pisilinux.org</Email>
-        </Update>
-    </History>
-</PISI>
diff --git a/x11/driver/xorg-input-aiptek/translations.xml b/x11/driver/xorg-input-aiptek/translations.xml
deleted file mode 100644
index 96bc0faca1..0000000000
--- a/x11/driver/xorg-input-aiptek/translations.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<PISI>
-    <Source>
-        <Name>xorg-input-aiptek</Name>
-        <Summary xml:lang="tr">X.Org aiptek Dijital Tablet giriş aygıtı sürücüsü</Summary>
-        <Description xml:lang="tr">xorg-input-aiptek, Linux'un genel olay aygıtları için X.Org sürücüsünü içerir. Çekirdek tarafından bilinen tüm giriş aygıtlarını destekler.</Description>
-    </Source>
-</PISI>
diff --git a/x11/driver/xorg-video-intel/actions.py b/x11/driver/xorg-video-intel/actions.py
index 2e6611afe6..261574d19f 100644
--- a/x11/driver/xorg-video-intel/actions.py
+++ b/x11/driver/xorg-video-intel/actions.py
@@ -6,15 +6,13 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-
+from pisi.actionsapi import shelltools
 
 def setup():
     # DRI3 has been known to be buggy with the current stack, so is disabled
-    autotools.configure("\
-                         --disable-static \
-                         --disable-dri3 \
-                         --enable-glamor \
-                        ")
+    
+    shelltools.system("NOCONFIGURE=1 ./autogen.sh")
+    autotools.configure()
     
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
@@ -24,4 +22,4 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "NEWS", "README")
+  #  pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "NEWS", "README")
diff --git a/x11/driver/xorg-video-intel/pspec.xml b/x11/driver/xorg-video-intel/pspec.xml
index 006e8fec3a..d26f8ca30b 100644
--- a/x11/driver/xorg-video-intel/pspec.xml
+++ b/x11/driver/xorg-video-intel/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>driver</IsA>
         <Summary>X.Org intel video driver</Summary>
         <Description>xorg-video-intel contains the X.Org driver for Intel video chipsets.</Description>
-        <Archive sha1sum="9af9ded7a29026c211e5eb50a547e3e33976301d" type="tarbz2">mirrors://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2</Archive>
+        <Archive sha1sum="6f00866f1bec46b1f3bd3fb89e1cbc3a00032315" type="tarxz">http://anduin.linuxfromscratch.org/BLFS/xf86-video-intel/xf86-video-intel-0340718.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>libX11-devel</Dependency>
             <Dependency>libxcb-devel</Dependency>
@@ -73,6 +73,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2016-05-02</Date>
+            <Version>0340718</Version>
+            <Comment>Version bump</Comment>
+            <Name>Burak Ertürk</Name>
+            <Email>burakerturk@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2015-05-10</Date>
             <Version>2.99.917</Version>