diff --git a/alarm/wiringpi-examples/PKGBUILD b/alarm/wiringpi-examples/PKGBUILD
deleted file mode 100644
index d2db60278..000000000
--- a/alarm/wiringpi-examples/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Mike Brown <mbrown@archlinuxarm.org>
-_pkgbase='wiringPi'
-pkgname=wiringpi-examples
-pkgver=19_Jul_2012
-pkgrel=1
-pkgdesc="WiringPi: An implementation of most of the Arduino Wiring functions for the Raspberry Pi"
-arch=('arm')
-license=('LGPL')
-url="https://projects.drogon.net/raspberry-pi/wiringpi/"
-depends=('wiringpi-headers')
-source=(http://project-downloads.drogon.net/files/wiringPi.tgz)
-md5sums=('b3c6b79c525e0d1db436445f7aabe716')
-install=wiringpi-examples.install
-groups=wiringpi
-
-build() {
-
-  cd "${srcdir}/${_pkgbase}/examples"
-  make
-
-}
-
-
-package(){
-  cd "${srcdir}/${_pkgbase}/examples"
-
-  install -Dm750 "${srcdir}/wiringPi/examples/test1" "${pkgdir}/root/wiringPi_examples/test1"
-  install -Dm750 "${srcdir}/wiringPi/examples/test2" "${pkgdir}/root/wiringPi_examples/test2"
-  install -Dm750 "${srcdir}/wiringPi/examples/speed" "${pkgdir}/root/wiringPi_examples/speed"
-  install -Dm750 "${srcdir}/wiringPi/examples/lcd" "${pkgdir}/root/wiringPi_examples/lcd"
-  install -Dm750 "${srcdir}/wiringPi/examples/wfi" "${pkgdir}/root/wiringPi_examples/wfi"
-  install -Dm750 "${srcdir}/wiringPi/examples/piface" "${pkgdir}/root/wiringPi_examples/piface"
-
-
-
-
-
-
-
-  
-
-
-}
diff --git a/alarm/wiringpi-examples/wiringpi-examples.install b/alarm/wiringpi-examples/wiringpi-examples.install
deleted file mode 100644
index 4ebd82466..000000000
--- a/alarm/wiringpi-examples/wiringpi-examples.install
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is a default template for a post-install scriptlet.
-# Uncomment only required functions and remove any functions
-# you don't need (and this header).
-
-## arg 1:  the new package version
-#pre_install() {
-  # do something here
-#}
-
-## arg 1:  the new package version
-post_install() {
-   echo ""
-   echo ""
-   echo ""
-   echo "*******************************************************************"
-   echo "The test example programs  are installed in /root/wiringPi_examples"
-   echo "*******************************************************************"
-   echo ""
-   echo ""
-   echo ""
-
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#pre_upgrade() {
-  # do something here
-#}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#post_upgrade() {
-  # do something here
-#}
-
-## arg 1:  the old package version
-#pre_remove() {
-  # do something here
-#}
-
-## arg 1:  the old package version
-post_remove() {
-   echo ""
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/alarm/wiringpi-gpio/PKGBUILD b/alarm/wiringpi-gpio/PKGBUILD
deleted file mode 100644
index b77b8a63c..000000000
--- a/alarm/wiringpi-gpio/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Mike Brown <mbrown@archlinuxarm.org>
-_pkgbase='wiringPi'
-pkgname=wiringpi-gpio
-pkgver=19_Jul_2012
-pkgrel=1
-pkgdesc="WiringPi: An implementation of most of the Arduino Wiring functions for the Raspberry Pi"
-arch=('arm')
-license=('LGPL')
-url="https://projects.drogon.net/raspberry-pi/wiringpi/"
-depends=('wiringpi-headers')
-source=(http://project-downloads.drogon.net/files/wiringPi.tgz)
-md5sums=('b3c6b79c525e0d1db436445f7aabe716')
-groups=wiringpi
-
-build() {
-
-  cd "${srcdir}/${_pkgbase}/gpio"
-  make
-
-
-}
-
-package(){
-  cd "${srcdir}/${_pkgbase}/gpio"
-  make DESTDIR="${pkgdir}" install
-
-}
diff --git a/alarm/wiringpi-headers/PKGBUILD b/alarm/wiringpi-headers/PKGBUILD
deleted file mode 100644
index a1a79a9b7..000000000
--- a/alarm/wiringpi-headers/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Mike Brown <mbrown@archlinuxarm.org>
-plugrel=3
-_pkgbase='wiringPi'
-pkgname=wiringpi-headers
-pkgver=19_Jul_2012
-pkgrel=1
-pkgdesc="WiringPi: An implementation of most of the Arduino Wiring functions for the Raspberry Pi"
-arch=('arm')
-license=('LGPL')
-provides=('wiringpi-headers')
-url="https://projects.drogon.net/raspberry-pi/wiringpi/"
-source=(http://project-downloads.drogon.net/files/wiringPi.tgz)
-md5sums=('b3c6b79c525e0d1db436445f7aabe716')
-groups=wiringpi
-
-build() {
-  cd "${srcdir}/${_pkgbase}/wiringPi"
-  make
-
-}
-
-package(){
-  cd "${srcdir}/${_pkgbase}/wiringPi"
-  make DESTDIR="${pkgdir}" install
-
-
-}
diff --git a/alarm/wiringpi/PKGBUILD b/alarm/wiringpi/PKGBUILD
index 237e95d31..6d9442588 100644
--- a/alarm/wiringpi/PKGBUILD
+++ b/alarm/wiringpi/PKGBUILD
@@ -1,54 +1,51 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-plugrel=3
-_pkgbase='wiringPi'
+# Maintainer: Mike Brown <mbrown@archlinuxarm.org>
+# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+
+buildarch=2
+
+_pkgname='wiringPi'
 pkgname=wiringpi
-pkgver=19_Jul_2012
+pkgver=20120726
 pkgrel=1
 pkgdesc="WiringPi: An implementation of most of the Arduino Wiring functions for the Raspberry Pi"
 arch=('arm')
 license=('LGPL')
 url="https://projects.drogon.net/raspberry-pi/wiringpi/"
 install=${pkgname}.install
-source=(wiringPi.tgz)
+source=(http://project-downloads.drogon.net/files/${_pkgname}.tgz)
 md5sums=('b3c6b79c525e0d1db436445f7aabe716')
 
 
 build() {
-  cd "${srcdir}/${_pkgbase}/wiringPi"
+  cd "${srcdir}/${_pkgname}/wiringPi"
   make
-  make install
-  cd "${srcdir}/${_pkgbase}/gpio"
-  make
-  cd "${srcdir}/${_pkgbase}/examples"
-  make
-  cd "${srcdir}/${_pkgbase}/wiringPi"
-  make uninstall
 
+  cd "${srcdir}/${_pkgname}/gpio"
+  make INCLUDE+="-I${srcdir}/${_pkgname}/wiringPi" LDFLAGS+="-L${srcdir}/${_pkgname}/wiringPi"
 
+  cd "${srcdir}/${_pkgname}/examples"
+  make INCLUDE+="-I${srcdir}/${_pkgname}/wiringPi" LDFLAGS+="-L${srcdir}/${_pkgname}/wiringPi"
 }
 
 package(){
-  cd "${srcdir}/${_pkgbase}/wiringPi"
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}/${_pkgbase}/gpio"
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}/${_pkgbase}/examples"
-
-  install -Dm750 "${srcdir}/wiringPi/examples/test1" "${pkgdir}/root/wiringPi_examples/test1"
-  install -Dm750 "${srcdir}/wiringPi/examples/test2" "${pkgdir}/root/wiringPi_examples/test2"
-  install -Dm750 "${srcdir}/wiringPi/examples/speed" "${pkgdir}/root/wiringPi_examples/speed"
-  install -Dm750 "${srcdir}/wiringPi/examples/lcd" "${pkgdir}/root/wiringPi_examples/lcd"
-  install -Dm750 "${srcdir}/wiringPi/examples/wfi" "${pkgdir}/root/wiringPi_examples/wfi"
-  install -Dm750 "${srcdir}/wiringPi/examples/piface" "${pkgdir}/root/wiringPi_examples/piface"
-
-
-
-
-
-
-
-  
+  cd "${srcdir}/${_pkgname}/wiringPi"
+  install -m 0755 -d "${pkgdir}/usr/lib"
+  install -m 0755 -d "${pkgdir}/usr/include"
+  install -m 0644 *.h      "${pkgdir}/usr/include"
+  install -m 0644 libwiringPi.a   "${pkgdir}/usr/lib"
 
+  cd "${srcdir}/${_pkgname}/gpio"
+  install -m 0755 -d "${pkgdir}/usr/bin"
+  install -m 4755 gpio  "${pkgdir}/usr/bin"
+  mkdir -p "${pkgdir}/usr/share/man/man1"
+  install -m 0644 gpio.1 "${pkgdir}/usr/share/man/man1/"
 
+  cd "${srcdir}/${_pkgname}/examples"
+  install -m 0755 -d "${pkgdir}/usr/share/wiringpi/examples"
+  install -Dm750 "${srcdir}/wiringPi/examples/test1" "${pkgdir}/usr/share/wiringpi/examples/test1"
+  install -Dm750 "${srcdir}/wiringPi/examples/test2" "${pkgdir}/usr/share/wiringpi/examples/test2"
+  install -Dm750 "${srcdir}/wiringPi/examples/speed" "${pkgdir}/usr/share/wiringpi/examples/speed"
+  install -Dm750 "${srcdir}/wiringPi/examples/lcd" "${pkgdir}/usr/share/wiringpi/examples/lcd"
+  install -Dm750 "${srcdir}/wiringPi/examples/wfi" "${pkgdir}/usr/share/wiringpi/examples/wfi"
+  install -Dm750 "${srcdir}/wiringPi/examples/piface" "${pkgdir}/usr/share/wiringpi/examples/piface"
 }
diff --git a/alarm/wiringpi/wiringpi.install b/alarm/wiringpi/wiringpi.install
index bdcec7f31..1e7dd8c19 100644
--- a/alarm/wiringpi/wiringpi.install
+++ b/alarm/wiringpi/wiringpi.install
@@ -1,46 +1,4 @@
-# This is a default template for a post-install scriptlet.
-# Uncomment only required functions and remove any functions
-# you don't need (and this header).
-
-## arg 1:  the new package version
-#pre_install() {
-  # do something here
-#}
-
-## arg 1:  the new package version
 post_install() {
-   echo ""
-   echo ""
-   echo ""
-   echo "**********************************************************"
-   echo "The test examples are installed in /root/wiringPi_examples"
-   echo "**********************************************************"
-   echo ""
-   echo ""
-   echo ""
-
+  echo " >> WiringPi examples are installed in /usr/share/wiringpi/examples"
+  echo ""
 }
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#pre_upgrade() {
-  # do something here
-#}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#post_upgrade() {
-  # do something here
-#}
-
-## arg 1:  the old package version
-#pre_remove() {
-  # do something here
-#}
-
-## arg 1:  the old package version
-post_remove() {
-   echo ""
-}
-
-# vim:set ts=2 sw=2 et: