diff -ur eagle_/eagle.desktop eagle/eagle.desktop
--- eagle_/eagle.desktop	2010-08-12 16:45:36.000000000 +0100
+++ eagle/eagle.desktop	2012-10-17 20:05:42.393015852 +0100
@@ -4,5 +4,5 @@
 Name=EAGLE Light Edition
 TryExec=/usr/bin/eagle
 Exec=eagle
-Icon=/opt/eagle-@VERSION@/bin/eagleicon16.png 
+Icon=/opt/eagle/bin/eagleicon16.png 
 Categories=Development;
diff -ur eagle_/eagle.sh eagle/eagle.sh
--- eagle_/eagle.sh	2012-02-22 10:55:00.000000000 +0000
+++ eagle/eagle.sh	2012-10-17 21:32:12.365219238 +0100
@@ -1,30 +1,5 @@
 #!/bin/bash
-#
-# A personal lbr dir can be set via $1 (defaults to $HOME/eagle/lbr if not set)
-#
 
-readonly VER=@VERSION@
-readonly REL=@RELEASE@
+rsync -aq /opt/eagle/ "$HOME/.eagle"
 
-LOCAL_DIR="$HOME"/.eagle
-PROJ_DIR="$HOME"/eagle
-EAGLE_DIR=/opt/eagle-$VER
-
-LOCAL_LBR="${1:-$PROJ_DIR/lbr}"
-if [[ -n $1 ]] || (! grep "^Directories\.Lbr[^=]*=" "$HOME"/.eaglerc &> /dev/null); then
-  echo "Directories.Lbr = \"$LOCAL_LBR\"" >> "$HOME"/.eaglerc
-fi
-
-create_local() {
-  rm -rf "$LOCAL_DIR"
-  install -dm755 "$LOCAL_DIR"
-  cp -r "$EAGLE_DIR"/* "$LOCAL_DIR"
-  touch "$LOCAL_DIR"/.eagle-$VER-$REL
-}
-
-[[ ! -e "$LOCAL_DIR"/.eagle-$VER-$REL ]] && create_local
-[[ ! -d "$LOCAL_LBR" ]] && install -dm755 "$LOCAL_LBR"
-[[ ! -d "$PROJ_DIR" ]] && install -dm755 "$PROJ_DIR"
-
-cd "$LOCAL_DIR"/bin
-exec ./eagle "$@"
+exec "$HOME"/.eagle/bin/eagle "$@"
diff -ur eagle_/PKGBUILD eagle/PKGBUILD
--- eagle_/PKGBUILD	2012-10-17 14:10:22.000000000 +0100
+++ eagle/PKGBUILD	2012-10-17 21:38:39.289466359 +0100
@@ -1,39 +1,36 @@
 pkgname=eagle
 pkgver=6.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A powerful suite for schematic capture and printed circuit board design (aka eaglecad)"
 arch=('i686' 'x86_64')
 url="http://www.cadsoft.de/"
 license=('custom')
 [[ $CARCH = i686 ]] && depends=('gcc-libs' 'libxcursor' 'libjpeg-turbo' 'libxi'
-    'libxrandr' 'openssl' 'libpng14')
+    'libxrandr' 'openssl' 'libpng14' 'rsync')
 [[ $CARCH = x86_64 ]] && depends=('lib32-fontconfig' 'lib32-freetype2'
     'lib32-gcc-libs' 'lib32-libxcursor' 'lib32-libjpeg-turbo'
-    'lib32-libxi' 'lib32-libxrandr' 'lib32-openssl' 'lib32-libpng14' 'lib32-libxrender')
+    'lib32-libxi' 'lib32-libxrandr' 'lib32-openssl' 'lib32-libpng14'
+    'lib32-libxrender' 'rsync')
 options=('!strip')
 source=(ftp://ftp.cadsoft.de/$pkgname/program/${pkgver%.*}/$pkgname-lin-$pkgver.run
         $pkgname.desktop
         $pkgname.sh)
 md5sums=('661defb4ae9531e829a96c9aaaa16b0e'
-         '8744e3b023e728660b97146b2e3c2dc7'
-         '8ac37660a008823313711099409acfef')
+         '519d39acd22aabd16bd6fdb54b52a202'
+         'fcc538a36a7baea316cc48655aabcd1c')
 
 PKGEXT='.pkg.tar'
 
 build() {
   cd "$srcdir"
   install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 $pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   msg2 "Running installation script (this may take a while)..."
   sh $pkgname-lin-$pkgver.run "$pkgdir/opt" > /dev/null
-  install -dm755 "$pkgdir"/usr/share/{man/man1,licenses/$pkgname,pixmaps}
-  ln -sf /opt/$pkgname-$pkgver/doc/$pkgname.1 \
-    "$pkgdir/usr/share/man/man1/$pkgname.1"
-  ln -sf /opt/$pkgname-$pkgver/doc/license_en.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  chown -R root:root "$pkgdir/opt/$pkgname-$pkgver"
-  sed -i "s/@VERSION@/$pkgver/; s/@RELEASE@/$pkgrel/" \
-    "$pkgdir"/usr/{bin/$pkgname,share/applications/$pkgname.desktop}
+  mv "$pkgdir/opt/$pkgname-$pkgver" "$pkgdir/opt/$pkgname"
+  install -dm755 "$pkgdir"/usr/share/{man/man1,licenses/$pkgname}
+  ln -sf /opt/$pkgname/doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
+  ln -sf /opt/$pkgname/doc/license_en.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  chown -R root:root "$pkgdir/opt/$pkgname"
 }