diff --git a/amule/PKGBUILD b/amule/PKGBUILD
index acf2edc..1c8f08e 100644
--- a/amule/PKGBUILD
+++ b/amule/PKGBUILD
@@ -2,12 +2,12 @@ md5sums=('68099241871f4e47eee06bebc7ce20a1'
          '9c1c06c1f7eaffd5dd383b7e0348b6db')
 pkgname=amule
 pkgver=10808
-pkgrel=2
+pkgrel=3
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'filesystem-extra')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
 makedepends=('ccache')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
 	"http://chakra.sourceforge.net/sources/oxygen-themes/aMule_Oxygen_Skin.zip")
@@ -17,8 +17,8 @@ md5sums=('68099241871f4e47eee06bebc7ce20a1'
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  ./configure --prefix=/extra/usr \
-              --mandir=/extra/usr/share/man \
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
               --enable-cas \
               --enable-wxcas \
               --enable-amule-daemon \
@@ -42,5 +42,5 @@ package() {
 
   make DESTDIR=${pkgdir}/ install
 
-  cp -f $srcdir/aMule_Oxygen_Skin.zip $pkgdir/extra/usr/share/amule/skins/
+  cp -f $srcdir/aMule_Oxygen_Skin.zip $pkgdir/usr/share/amule/skins/
 }
diff --git a/ardour3/PKGBUILD b/ardour3/PKGBUILD
index 9b89440..59c137e 100644
--- a/ardour3/PKGBUILD
+++ b/ardour3/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=ardour
 _pkgname=Ardour3
 pkgver=3.5.14
 _pkgver=3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Professional-grade digital audio workstation"
 arch=('x86_64')
 url="http://ardour.org/"
@@ -26,8 +26,8 @@ prepare() {
 build() {
   cd "$srcdir/$_pkgname-$_pkgver"
 
-  python2 waf configure --prefix=/extra/usr \
-                        --configdir=/extra/etc \
+  python2 waf configure --prefix=/usr \
+                        --configdir=/etc \
                         --docs
 
   python2 waf build $MAKEFLAGS
@@ -40,5 +40,5 @@ package() {
 
   # install some freedesktop.org compatibility
   install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/extra/usr/share/applications/$pkgname.desktop"
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 }
diff --git a/audacity/PKGBUILD b/audacity/PKGBUILD
index 65ecbf8..d476817 100644
--- a/audacity/PKGBUILD
+++ b/audacity/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=audacity
 pkgver=2.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('x86_64')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 
          'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils' 'redland' 
-         'jack' 'soundtouch' 'filesystem-extra')
+         'jack' 'soundtouch')
 makedepends=('zip' 'python' 'pkgconfig')
 options=('!makeflags')
 install="${pkgname}.install"
@@ -16,7 +16,7 @@ sha256sums=('e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79')
 
 build() {
   cd ${pkgname}-src-${pkgver}
-  WX_CONFIG=/extra/usr/bin/wx-config ./configure --prefix=/extra/usr \
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
     --enable-unicode 
   make
 }
diff --git a/babl/PKGBUILD b/babl/PKGBUILD
index d5508ed..a2a603e 100644
--- a/babl/PKGBUILD
+++ b/babl/PKGBUILD
@@ -2,19 +2,19 @@
 
 pkgname=babl
 pkgver=0.1.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Dynamic, any to any, pixel format conversion library"
 arch=('x86_64')
 url="http://gegl.org/babl/"
 license=('LGPL3')
-depends=('glibc' 'filesystem-extra')
+depends=('glibc')
 options=('!libtool' '!makeflags')
 source=("ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('9e1542ab5c0b12ea3af076a9a2f02d79')
  
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/extra/usr
+  ./configure --prefix=/usr
   make
 }
  
diff --git a/bluegriffon/PKGBUILD b/bluegriffon/PKGBUILD
index 93023a7..e2f9df3 100644
--- a/bluegriffon/PKGBUILD
+++ b/bluegriffon/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=bluegriffon
 pkgver=1.7.2
-pkgrel=1
+pkgrel=2
 pkgdesc='The next-generation Web Editor'
 url="http://bluegriffon.org/"
 arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('libpng' 'libjpeg' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info' 'filesystem-extra' 'gtk2')
+depends=('libpng' 'libjpeg' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info' 'gtk2')
 makedepends=('wget')
 install='bluegriffon.install'
 source=("http://bluegriffon.org/freshmeat/${pkgver}/bluegriffon-${pkgver}.Ubuntu13.04.x86_64.tar.bz2"
@@ -17,11 +17,11 @@ md5sums=('fbae6365980d87dde5e4ce044d55be38'
 
 package() {
 	cd ${srcdir}
-	mkdir -p ${pkgdir}/extra/usr/{bin,lib,share/{applications,pixmaps}}
-	cp -R bluegriffon ${pkgdir}/extra/usr/lib/${pkgname}
+	mkdir -p ${pkgdir}/usr/{bin,lib,share/{applications,pixmaps}}
+	cp -R bluegriffon ${pkgdir}/usr/lib/${pkgname}
 
-        install -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/extra/usr/share/applications/
-        install -m644 ${srcdir}/bluegriffon/chrome/icons/default/default48.png ${pkgdir}/extra/usr/share/pixmaps/${pkgname}-icon.png
+        install -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/
+        install -m644 ${srcdir}/bluegriffon/chrome/icons/default/default48.png ${pkgdir}/usr/share/pixmaps/${pkgname}-icon.png
 
-        ln -sf /extra/usr/lib/bluegriffon/bluegriffon $pkgdir/extra/usr/bin/
+        ln -sf /usr/lib/bluegriffon/bluegriffon $pkgdir/usr/bin/
 }
diff --git a/chromium/PKGBUILD b/chromium/PKGBUILD
index 142fa4e..6be152c 100644
--- a/chromium/PKGBUILD
+++ b/chromium/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=chromium
 pkgver=30.0.1599.114
-pkgrel=2
+pkgrel=3
 _verbld=${pkgver}-1 # used for libpdf and pepper-flash
 _pepperflashver=11.9.900.117
 _toolchains_rev=12029
@@ -12,7 +12,7 @@ pkgdesc="The open-source project behind Google Chrome, an attempt at creating a
 arch=('x86_64')
 url="http://www.chromium.org/"
 license=('BSD')
-depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'v8' 'zlib' 'filesystem-extra')
+depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'v8' 'zlib')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'lib32-gcc-libs' 'subversion' 'ninja')
 install=chromium.install
 source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${pkgver}.tar.xz                 
@@ -44,9 +44,9 @@ sha1sums=('70477efec5b6fa1b4ca81f3087e40bf7fd377cf4'
           '4dba1c5504537a3565cd93345e4c6eabd98d5d05'
           'd9f4b2b624e8580c947ddf2377480122b295460f'
           'b595fda0dc2f18af1723976a9bf9c5725d3ec31c'
-          'd02e7eaaa5de9407d8744a03a1306c117b659098'
-          'fa93e2d3d4d52a1a29a1c446092a158f05751fcc'
-          '3d9663f614113c137016fadb963e150f11f17402'
+          '3ab45403f3e8ddfeeba6a5aee9f683d57883fb90'
+          '19eff765ec1316f4ae057d48919b2fdd6b3a5bea'
+          '11332bcd0318d573bea1aa0744213a5d006aecc4'
           '5cd50202719569cb9bc6624ad0bb3c9cbbc5a828'
           '51065e45d0060374346f3c756a6b1cd0d1fb1323'
           '4ac33284c534b5117741b551cc531589cfa08d75'
@@ -142,49 +142,49 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  install -D out/Release/chrome ${pkgdir}/extra/usr/lib/chromium/chromium
+  install -D out/Release/chrome ${pkgdir}/usr/lib/chromium/chromium
 
   install -Dm4755 -o root -g root out/Release/chrome_sandbox \
-    "$pkgdir/extra/usr/lib/chromium/chrome-sandbox"
+    "$pkgdir/usr/lib/chromium/chrome-sandbox"
 
   cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
     out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
-    "$pkgdir/extra/usr/lib/chromium/"
+    "$pkgdir/usr/lib/chromium/"
 
   # override command-line options
-  install -Dm644 "$srcdir/chromium.default" "$pkgdir/extra/etc/chromium/default"
+  install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
 
-  cp -a out/Release/locales out/Release/resources "$pkgdir/extra/usr/lib/chromium/"
+  cp -a out/Release/locales out/Release/resources "$pkgdir/usr/lib/chromium/"
 
-  find "$pkgdir/extra/usr/lib/chromium/" -name '*.d' -type f -delete
+  find "$pkgdir/usr/lib/chromium/" -name '*.d' -type f -delete
 
-  install -Dm644 out/Release/chrome.1 "$pkgdir/extra/usr/share/man/man1/chromium.1"
+  install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
 
   install -Dm644 "$srcdir/chromium.desktop" \
-    "$pkgdir/extra/usr/share/applications/chromium.desktop"
+    "$pkgdir/usr/share/applications/chromium.desktop"
 
   for size in 22 24 48 64 128 256; do
     install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
-      "$pkgdir/extra/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
   done
   
   for size in 16 32; do
     install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
-      "$pkgdir/extra/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
   done
 
-  install -D "$srcdir/chromium.sh" "$pkgdir/extra/usr/bin/chromium"
+  install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
 
-  install -Dm644 LICENSE "$pkgdir/extra/usr/share/licenses/chromium/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
   
   #### PepperFlash ####
   cd "$srcdir"
-  install -d "$pkgdir/extra/usr/lib/PepperFlash"
-  install -m644 opt/google/chrome/PepperFlash/* "$pkgdir/extra/usr/lib/PepperFlash"
+  install -d "$pkgdir/usr/lib/PepperFlash"
+  install -m644 opt/google/chrome/PepperFlash/* "$pkgdir/usr/lib/PepperFlash"
   sed -i "s/flashver=.*/flashver=$_pepperflashver/" "$startdir/chromium.install"
-  install -Dm644 "$srcdir/license.html" "$pkgdir/extra/usr/share/licenses/$pkgname/license.html"
+  install -Dm644 "$srcdir/license.html" "$pkgdir/usr/share/licenses/$pkgname/license.html"
   
   #### libpdf ####
-  install -d "${pkgdir}/extra/usr/lib/chromium"
-  install -m644 opt/google/chrome/libpdf.so "${pkgdir}/extra/usr/lib/chromium"
+  install -d "${pkgdir}/usr/lib/chromium"
+  install -m644 opt/google/chrome/libpdf.so "${pkgdir}/usr/lib/chromium"
 }
diff --git a/chromium/chromium.default b/chromium/chromium.default
index 92fdcec..8291e43 100644
--- a/chromium/chromium.default
+++ b/chromium/chromium.default
@@ -2,4 +2,4 @@
 
 # Options to pass to chromium
 # flash-version updated dynamically with .install file
-CHROMIUM_FLAGS="--ppapi-flash-path=/extra/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version=1.2.3.4"
\ No newline at end of file
+CHROMIUM_FLAGS="--ppapi-flash-path=/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version=1.2.3.4"
\ No newline at end of file
diff --git a/chromium/chromium.desktop b/chromium/chromium.desktop
index a379197..ffda53d 100644
--- a/chromium/chromium.desktop
+++ b/chromium/chromium.desktop
@@ -61,7 +61,7 @@ Comment[de]=Chromium web-browser bundel, mit pdf, flash und gtalk plugin
 Comment[en_GB]=Chromium web-browser bundle, including pdf, pepper-flash and gtalk plugin
 Exec=chromium %U
 Terminal=false
-Icon=chromium.png
+Icon=chromium
 Type=Application
 Categories=Application;Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml_xml;
diff --git a/chromium/chromium.install b/chromium/chromium.install
index ed1053f..df3fab8 100644
--- a/chromium/chromium.install
+++ b/chromium/chromium.install
@@ -1,5 +1,5 @@
-[ -f extra/etc/chromium-browser/default ] && _default='extra/etc/chromium-browser/default'
-[ -f extra/etc/chromium/default ] && _default='extra/etc/chromium/default'
+[ -f etc/chromium-browser/default ] && _default='etc/chromium-browser/default'
+[ -f etc/chromium/default ] && _default='etc/chromium/default'
 flashver=11.9.900.117
 
 instructions() {
@@ -29,7 +29,7 @@ post_upgrade() {
 	if [[ $(cat "$_default") == *ppapi* ]]; then
 	  sed -i "s/ppapi-flash-version=.*[0-9]/ppapi-flash-version=$flashver/g" "$_default"
 	else
-	  sed -i '/CHROMIUM_FLAGS/s|"$| --ppapi-flash-path=/extra/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version='$flashver'"|' "$_default"
+	  sed -i '/CHROMIUM_FLAGS/s|"$| --ppapi-flash-path=/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version='$flashver'"|' "$_default"
 	fi
 }
 
diff --git a/chromium/chromium.sh b/chromium/chromium.sh
index fa51bda..4d02834 100755
--- a/chromium/chromium.sh
+++ b/chromium/chromium.sh
@@ -2,8 +2,8 @@
 
 # Override command-line options
 # Based on Gentoo's chromium package (and by extension, Debian's)
-if [[ -f /extra/etc/chromium/default ]]; then
-	. /extra/etc/chromium/default
+if [[ -f /etc/chromium/default ]]; then
+	. /etc/chromium/default
 fi
 
 # Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
@@ -14,5 +14,5 @@ CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
 export CHROME_WRAPPER=$(readlink -f "$0")
 export CHROME_DESKTOP=chromium.desktop
 
-exec /extra/usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
+exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
 
diff --git a/eclipse/PKGBUILD b/eclipse/PKGBUILD
index 369fdb6..a53f948 100644
--- a/eclipse/PKGBUILD
+++ b/eclipse/PKGBUILD
@@ -1,12 +1,12 @@
 
 pkgname=eclipse
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 _date=201309111000
 pkgdesc="An IDE for Java and other languages."
 arch=('x86_64')
 url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit-gtk2' 'libxtst' 'filesystem-extra')
+depends=('java-environment' 'gtk2' 'unzip' 'libwebkit-gtk2' 'libxtst')
 install=${pkgname}.install
 makedepends=('zip')
 license=("EPL/1.0")
@@ -32,29 +32,30 @@ package() {
   cd "${srcdir}/${pkgname}"
 
   # install eclipse
-  install -d -m755 "${pkgdir}/extra/usr/share"
-  cp -ar "${srcdir}/eclipse" "${pkgdir}/extra/usr/share/"
+  install -d -m755 "${pkgdir}/usr/share"
+  cp -ar "${srcdir}/eclipse" "${pkgdir}/usr/share/"
 
   # install misc
-  install -d "${pkgdir}/extra/usr/bin" \
-             "${pkgdir}/extra/usr/share/applications" \
-             "${pkgdir}/extra/usr/share/icons/hicolor"/{16x16,32x32,48x48,256x256}/apps
+  install -d "${pkgdir}/usr/bin" \
+             "${pkgdir}/usr/share/applications" \
+             "${pkgdir}/usr/share/icons/hicolor"/{16x16,32x32,48x48,256x256}/apps
 
   # install bin symlink
-  ln -s "/extra/usr/share/eclipse/eclipse" "$pkgdir/extra/usr/bin/"
-  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/extra/usr/share/applications/"
+  ln -s "/usr/share/eclipse/eclipse" "$pkgdir/usr/bin/"
+  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
   
   # install icon
-  ln -s "/extra/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse.png"   "${pkgdir}/extra/usr/share/icons/hicolor/16x16/apps/eclipse.png"
-  ln -s "/extra/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse32.png" "${pkgdir}/extra/usr/share/icons/hicolor/32x32/apps/eclipse.png"
-  ln -s "/extra/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse48.png" "${pkgdir}/extra/usr/share/icons/hicolor/48x48/apps/eclipse.png"
-  ln -s "/extra/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse256.png" "${pkgdir}/extra/usr/share/icons/hicolor/256x256/apps/eclipse.png"
+  ln -s "/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse.png"   "${pkgdir}/usr/share/icons/hicolor/16x16/apps/eclipse.png"
+  ln -s "/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse32.png" "${pkgdir}/usr/share/icons/hicolor/32x32/apps/eclipse.png"
+  ln -s "/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/eclipse.png"
+  ln -s "/usr/share/eclipse/plugins/org.eclipse.sdk_${pkgver}.v${_date}/eclipse256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/eclipse.png"
 
 
   install -D -m644 "${srcdir}/eclipse.png" \
-                   "${pkgdir}/extra/usr/share/icons/hicolor/512x512/apps/eclipse.png"
+                   "${pkgdir}/usr/share/icons/hicolor/512x512/apps/eclipse.png"
 
   # license
+  install -d -m755 "${pkgdir}/usr/share/licenses/eclipse/"
   mv $pkgdir/usr/share/eclipse/epl-v10.html "$pkgdir/usr/share/licenses/eclipse/epl-v10.html"
 }
 
diff --git a/emacs/PKGBUILD b/emacs/PKGBUILD
index 4652d73..24c765c 100644
--- a/emacs/PKGBUILD
+++ b/emacs/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=emacs
 pkgver=24.3
-pkgrel=3
+pkgrel=4
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -13,7 +13,7 @@ md5sums=('ea9ed000ca165280265aabb55b9afbd7'
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/extra/usr --sysconfdir=/extra/etc --libexecdir=/extra/usr/lib \
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
   make
 }
@@ -23,13 +23,13 @@ package() {
   make DESTDIR="$pkgdir" install
 
   # remove conflict with ctags package
-  mv "$pkgdir"/extra/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/extra/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
 
   # remove conflict with texinfo
-  rm "$pkgdir"/extra/usr/share/info/info.info.gz
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/extra/usr/share/emacs/$pkgver -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/fcitx-gtk/fcitx-gtk2.install b/fcitx-gtk/fcitx-gtk2.install
index 2b218b9..2bdfac3 100644
--- a/fcitx-gtk/fcitx-gtk2.install
+++ b/fcitx-gtk/fcitx-gtk2.install
@@ -1,6 +1,6 @@
 post_install() {
-  if res="$(extra/usr/bin/gtk-query-immodules-2.0)"; then
-    echo "$res" > extra/etc/gtk-2.0/gtk.immodules
+  if res="$(usr/bin/gtk-query-immodules-2.0)"; then
+    echo "$res" > etc/gtk-2.0/gtk.immodules
   fi
 }
 
diff --git a/fcitx-gtk/fcitx-gtk3.install b/fcitx-gtk/fcitx-gtk3.install
index 858b914..b449587 100644
--- a/fcitx-gtk/fcitx-gtk3.install
+++ b/fcitx-gtk/fcitx-gtk3.install
@@ -1,5 +1,5 @@
 post_install() {
-    extra/usr/bin/gtk-query-immodules-3.0 --update-cache
+    usr/bin/gtk-query-immodules-3.0 --update-cache
 }
 
 post_upgrade() {
diff --git a/filezilla/PKGBUILD b/filezilla/PKGBUILD
index eebfd52..c9536f3 100644
--- a/filezilla/PKGBUILD
+++ b/filezilla/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=filezilla
 pkgver=3.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('x86_64')
 url="http://filezilla-project.org/"
 license=('GPL')
-depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'libsm' 'libxxf86vm' 'hicolor-icon-theme' 'sqlite3' 'filesystem-extra')
+depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'libsm' 'libxxf86vm' 'hicolor-icon-theme' 'sqlite3')
 install=${pkgname}.install
 changelog=${pkgname}.changelog
 source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2"
@@ -19,7 +19,7 @@ build() {
   cd "${pkgname}-${pkgver}"
   ./autogen.sh
   ./configure \
-    --prefix=/extra/usr \
+    --prefix=/usr \
     --disable-manualupdatecheck \
     --disable-autoupdatecheck \
     --disable-static \
@@ -33,12 +33,12 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  install -dm755 "${pkgdir}/extra/usr/share/filezilla/resources/oxygen"
-  cp -dpr --no-preserve=ownership "${srcdir}/oxygen" "${pkgdir}/extra/usr/share/filezilla/resources/"
+  install -dm755 "${pkgdir}/usr/share/filezilla/resources/oxygen"
+  cp -dpr --no-preserve=ownership "${srcdir}/oxygen" "${pkgdir}/usr/share/filezilla/resources/"
   
   # Install changelog
   install -Dm644 NEWS "${startdir}/${pkgname}.changelog"
   
-  install -dm755 "${pkgdir}/extra/usr/share/doc/${pkgname}"
-  install -Dm644 {AUTHORS,ChangeLog,README} "${pkgdir}/extra/usr/share/doc/${pkgname}/"
+  install -dm755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm644 {AUTHORS,ChangeLog,README} "${pkgdir}/usr/share/doc/${pkgname}/"
 }
diff --git a/firefox-i18n/PKGBUILD b/firefox-i18n/PKGBUILD
index 33e877a..076733f 100644
--- a/firefox-i18n/PKGBUILD
+++ b/firefox-i18n/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=firefox-i18n
 pkgver=25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Language pack for Firefox"
 arch=('any')
 url="http://www.mozilla.com/"
 license=('MPL' 'GPL')
-depends=("firefox-kde>=$pkgver" 'filesystem-extra')
+depends=("firefox-kde>=$pkgver")
 
 _languages=(
   'ach    "Acoli"'
@@ -115,7 +115,7 @@ package() {
   for _lang in "${_languages[@]}"; do
     _locale=${_lang%% *}
     install -Dm644 firefox-i18n-$pkgver-${_locale}.xpi \
-      "$pkgdir/extra/usr/lib/firefox/browser/extensions/langpack-${_locale}@firefox.mozilla.org.xpi"
+      "$pkgdir/usr/lib/firefox/browser/extensions/langpack-${_locale}@firefox.mozilla.org.xpi"
   done
 }
 
diff --git a/firefox-kde/PKGBUILD b/firefox-kde/PKGBUILD
index 4766cbf..f58f04d 100644
--- a/firefox-kde/PKGBUILD
+++ b/firefox-kde/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=firefox-kde
 pkgver=25.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 _kmozillahelper_obsver=b88c72dfdc858f6209feb123227bd7df
 _kmozillahelper_pkgname=kmozillahelper
@@ -10,7 +10,7 @@ _kmozillahelper_pkgver=0.6.4
 url='http://www.mozilla.org/projects/firefox'
 arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'startup-notification' 'libnotify' 'alsa-lib' 'gstreamer0.10' 'gstreamer0.10-base' 'libxt' 'dbus-glib' 'libevent' 'filesystem-extra' 'kdelibs')
+depends=('gtk2' 'startup-notification' 'libnotify' 'alsa-lib' 'gstreamer0.10' 'gstreamer0.10-base' 'libxt' 'dbus-glib' 'libevent' 'kdelibs')
 makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'unzip' 'autoconf2.13' 'mesa' 'yasm' 'cmake' 'automoc4' 'libpulse')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libpulse: PulseAudio audio driver')
@@ -126,7 +126,7 @@ build_firefox() {
   cd "mozilla-release"
  
   export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/extra/usr/lib/firefox"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
   export PYTHON="/usr/bin/python2"
   
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -143,28 +143,28 @@ package() {
   install -Dm644 ../kde.js "obj-ff/dist/bin/defaults/pref/kde.js"
   make -j1 -f client.mk MOZ_PKG_FATAL_WARNINGS=0 package
   #make -j1 -f client.mk DESTDIR="$pkgdir" install
-  mkdir -p $pkgdir/extra/usr/lib/ 
-  tar -C $pkgdir/extra/usr/lib/ -xf obj-ff/dist/firefox-$pkgver.en-US.linux-${CARCH}.tar.bz2
+  mkdir -p $pkgdir/usr/lib/ 
+  tar -C $pkgdir/usr/lib/ -xf obj-ff/dist/firefox-$pkgver.en-US.linux-${CARCH}.tar.bz2
 
-  install -Dm644 ../vendor.js "$pkgdir/extra/usr/lib/firefox/defaults/preferences/vendor.js"
-  install -Dm644 ../kde.js "$pkgdir/extra/usr/lib/firefox/defaults/preferences/kde.js"
-  install -Dm644 ../duckduckgo.xml "$pkgdir/extra/usr/lib/firefox/searchplugins/duckduckgo.xml"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/preferences/vendor.js"
+  install -Dm644 ../kde.js "$pkgdir/usr/lib/firefox/defaults/preferences/kde.js"
+  install -Dm644 ../duckduckgo.xml "$pkgdir/usr/lib/firefox/searchplugins/duckduckgo.xml"
 
   for i in 16 22 24 32 48 256; do
       install -Dm644 browser/branding/official/default$i.png \
-        "$pkgdir/extra/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
+        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
   done
 
   install -Dm644 ../firefox.desktop \
-    "$pkgdir/extra/usr/share/applications/firefox.desktop"
+    "$pkgdir/usr/share/applications/firefox.desktop"
 
-  mkdir -p $pkgdir/extra/usr/bin/ 
-  ln -sf /extra/usr/lib/firefox/firefox $pkgdir/extra/usr/bin/
+  mkdir -p $pkgdir/usr/bin/ 
+  ln -sf /usr/lib/firefox/firefox $pkgdir/usr/bin/
     
   # Use system-provided dictionaries
-  rm -rf "$pkgdir"/extra/usr/lib/firefox/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/extra/usr/lib/firefox/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/extra/usr/lib/firefox/hyphenation"
+  rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
 
 }
 
diff --git a/flashplugin/PKGBUILD b/flashplugin/PKGBUILD
index c2a3222..0421966 100644
--- a/flashplugin/PKGBUILD
+++ b/flashplugin/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=flashplugin
 _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
 pkgver=11.2.202.310
-pkgrel=1
+pkgrel=2
 pkgdesc='Adobe Flash Player'
 url='http://labs.adobe.com/technologies/flashplatformruntimes/flashplayer11/'
 arch=('x86_64')
-depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'filesystem-extra')
+depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl')
 optdepends=('libvdpau: GPU acceleration on Nvidia card')
 provides=('flashplayer')
 license=('custom')
@@ -17,20 +17,20 @@ source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_fl
         'mms.cfg')
 md5sums=('34b436d5c9c4e681bd619a6efad84148'
          '94ca2aecb409abfe36494d1a7ec7591d'
-         '31e165d90ffbfdd9d25291b74d68eded')
+         'f34aae6279b40e0bd2abfb0d9963d7b8')
 
 package () {
     cd ${srcdir}
    
     # Plugin install in /extra
-    install -Dm755 libflashplayer.so "${pkgdir}/extra/usr/lib/mozilla/plugins/libflashplayer.so"
-    install -Dm644 "${_licensefile}" "${pkgdir}/extra/usr/share/licenses/${pkgname}/LICENSE.pdf"
-    install -Dm644 ${srcdir}/mms.cfg "${pkgdir}/extra/etc/adobe/mms.cfg"
-    install -Dm755 usr/bin/flash-player-properties "${pkgdir}/extra/usr/bin/flash-player-properties"
-    install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/extra/usr/share/applications/flash-player-properties.desktop"
+    install -Dm755 libflashplayer.so "${pkgdir}/usr/lib/mozilla/plugins/libflashplayer.so"
+    install -Dm644 "${_licensefile}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf"
+    install -Dm644 ${srcdir}/mms.cfg "${pkgdir}/etc/adobe/mms.cfg"
+    install -Dm755 usr/bin/flash-player-properties "${pkgdir}/usr/bin/flash-player-properties"
+    install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/usr/share/applications/flash-player-properties.desktop"
     for i in 16x16 22x22 24x24 32x32 48x48; do
         install -Dm644 usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
-            "${pkgdir}/extra/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png"
+            "${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png"
     done
 
 
diff --git a/flashplugin/mms.cfg b/flashplugin/mms.cfg
index c5293ac..716525d 100644
--- a/flashplugin/mms.cfg
+++ b/flashplugin/mms.cfg
@@ -1,2 +1,2 @@
 #Hardware video decoding
-EnableLinuxHWVideoDecode=0
+#EnableLinuxHWVideoDecode=1
diff --git a/gcompris/PKGBUILD b/gcompris/PKGBUILD
index 10e5bbf..1edb540 100644
--- a/gcompris/PKGBUILD
+++ b/gcompris/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=('gcompris')
 pkgver=13.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
 arch=('x86_64')
 url="http://gcompris.net/"
 license=('GPL3')
 depends=('pygtk' 'python-pyxml' 'librsvg' 'python-pysqlite'
-           'gstreamer0.10-base-plugins' 'filesystem-extra')
+           'gstreamer0.10-base-plugins')
 makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess')
 optdepends=('gnucap: for computer simulation within the electricity activity'
             'tuxpaint: for the painting activity'
@@ -17,7 +17,7 @@ md5sums=('7c3396c02e44bbf72424ca12bfff9cf3')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
  
-  ./configure --prefix=/extra/usr
+  ./configure --prefix=/usr
   make
 }
  
@@ -26,5 +26,5 @@ package() {
   make DESTDIR="$pkgdir" install
 
   # Fix path for editor
-  sed -i -e "~s~gcompris -a~gcompris -l /extra/usr/lib/gcompris/ -a~" ${pkgdir}/extra/usr/share/applications/gcompris-edit.desktop
+  sed -i -e "~s~gcompris -a~gcompris -l /usr/lib/gcompris/ -a~" ${pkgdir}/usr/share/applications/gcompris-edit.desktop
 }
diff --git a/gegl/PKGBUILD b/gegl/PKGBUILD
index 84fca84..871a11f 100644
--- a/gegl/PKGBUILD
+++ b/gegl/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Graph based image processing framework."
 arch=('x86_64')
 url="http://www.gegl.org/"
@@ -17,7 +17,7 @@ sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' 'c10fd988c634fcf0948cc91a51
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 -i $srcdir/gentoo-gegl-0.2.0-ffmpeg-0.11.diff
-  ./configure --prefix=/extra/usr --with-sdl --with-openexr --with-librsvg --with-libavformat --with-jasper --disable-docs || return 1
+  ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg --with-libavformat --with-jasper --disable-docs || return 1
   make
 }
 
diff --git a/gimp/PKGBUILD b/gimp/PKGBUILD
index 83bdaba..c6ce9d7 100644
--- a/gimp/PKGBUILD
+++ b/gimp/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=gimp
 pkgver=2.8.8
 _pkgver=2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('x86_64')
 url="http://www.gimp.org/"
 license=('GPL3' 'LGPL3')
-depends=('libpng' 'pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' 'filesystem-extra' \
+depends=('libpng' 'pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
          'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
 makedepends=('intltool' 'libwebkit-gtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
@@ -25,7 +25,7 @@ md5sums=('ef2547c3514a1096931637bd6250635a'
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/extra/usr --sysconfdir=/extra/etc \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-python --with-libcurl \
     --with-gif-compression=lzw --without-aa --without-hal --without-gvfs --without-gnomevfs
   make
@@ -34,11 +34,11 @@ build() {
 package() {
   cd "${srcdir}/gimp-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/extra/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/extra/usr/share/gimp/2.0/palettes/Linux.gpl"
+  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
+  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
 
-  ln -sf gimp-console-${pkgver}.1.gz "${pkgdir}/extra/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimprc-${pkgver}.5.gz "${pkgdir}/extra/usr/share/man/man5/gimprc.5.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/extra/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver}.1.gz "${pkgdir}/extra/usr/share/man/man1/gimp.1.gz"
+  ln -sf gimp-console-${pkgver}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
+  ln -sf gimprc-${pkgver}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
+  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
+  ln -s gimp-${pkgver}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
 }
diff --git a/gnet/PKGBUILD b/gnet/PKGBUILD
index f3beaa7..a2a0d26 100644
--- a/gnet/PKGBUILD
+++ b/gnet/PKGBUILD
@@ -1,12 +1,11 @@
 pkgname=gnet
 pkgver=2.0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
 arch=('x86_64')
 url="https://live.gnome.org/GNetLibrary"
 license=('LGPL')
-depends=('glib2' 'filesystem-extra')
-options=('!libtool')
+depends=('glib2')
 install=install
 source=("http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('93327d2fca333d7e54ba2cf54e071165')
@@ -15,7 +14,7 @@ sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
  
-  ./configure --prefix=/extra/usr \
+  ./configure --prefix=/usr \
               --disable-gtk-doc \
               CFLAGS="$(pkg-config --cflags glib-2.0)" \
               LIBS="$(pkg-config --libs glib-2.0)" \
diff --git a/gtk2/PKGBUILD b/gtk2/PKGBUILD
index c18ee37..c137548 100644
--- a/gtk2/PKGBUILD
+++ b/gtk2/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.17
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -18,12 +18,19 @@ source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz"
 md5sums=('a10cc43fad8d64f8893d779b1f8322ff'
          '22355df723f6ca358e30e6b8f0baace5')
 
+prepare() {
+  cd "${srcdir}/gtk+-${pkgver}"
+
+  patch -Np1 -i "$srcdir/xid-collision-debug.patch"
+}
+
 build() {
     cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
 
-    CXX=/bin/false ./configure --prefix=/extra/usr \
-        --sysconfdir=/extra/etc \
+    autoreconf -vfi
+    
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
         --localstatedir=/var \
         --with-xinput=yes
 
@@ -42,10 +49,10 @@ package_gtk2() {
     cd "$srcdir/gtk+-$pkgver"
 
     make DESTDIR="$pkgdir" install
-    sed -i "s#env python#env python2#" $pkgdir/extra/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/extra/etc/gtk-2.0/gtkrc"
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
     #split this out to use with gtk3 too
-    rm $pkgdir/extra/usr/bin/gtk-update-icon-cache
+    rm $pkgdir/usr/bin/gtk-update-icon-cache
 }
 package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
@@ -53,5 +60,5 @@ package_gtk-update-icon-cache() {
 
     cd "$srcdir/gtk+-$pkgver/gtk"
 
-    install -D -m755 gtk-update-icon-cache $pkgdir/extra/usr/bin/gtk-update-icon-cache
+    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
 }
diff --git a/gtk2/gtk2.install b/gtk2/gtk2.install
index 0db073c..e06d42a 100644
--- a/gtk2/gtk2.install
+++ b/gtk2/gtk2.install
@@ -1,8 +1,8 @@
 post_install() {
   sbin/ldconfig -r .
 
-  extra/usr/bin/gtk-query-immodules-2.0 > extra/etc/gtk-2.0/gtk.immodules
-  usr/bin/gdk-pixbuf-query-loaders > extra/etc/gtk-2.0/gdk-pixbuf.loaders
+  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+  usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
 }
 
 post_upgrade() {
@@ -13,8 +13,8 @@ pre_remove() {
   rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
   rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
 
-  rm -f extra/etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f extra/etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
 
   sbin/ldconfig -r .
 }
diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD
index b4e06e4..14f228f 100644
--- a/gtk3/PKGBUILD
+++ b/gtk3/PKGBUILD
@@ -1,14 +1,14 @@
 pkgname=gtk3
 pkgver=3.6.4
 pkgmin="${pkgver%.*}"
-pkgrel=4
+pkgrel=5
 pkgdesc="The GTK+ Toolkit (v3)"
 arch=('x86_64')
 url="http://www.gtk.org/"
 install="gtk3.install"
 depends=('cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor'
          'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
-         'pango' 'shared-mime-info' 'colord' 'at-spi2-atk' 'filesystem-extra')
+         'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
 makedepends=('gobject-introspection')
 options=('!libtool' '!docs')
 backup=("etc/gtk-3.0/settings.ini" "extra/etc/gtk-3.0/settings.ini")
@@ -21,8 +21,8 @@ md5sums=('123d3dc6fc659539a308017934235b3e'
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
 
- ./configure --prefix=/extra/usr \
-             --sysconfdir=/extra/etc \
+ ./configure --prefix=/usr \
+             --sysconfdir=/etc \
              --localstatedir=/var \
              --enable-gtk2-dependency \
              --disable-schemas-compile
@@ -38,5 +38,5 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 "${srcdir}/settings.ini" \
-                   "${pkgdir}/extra/etc/gtk-3.0/settings.ini"
+                   "${pkgdir}/etc/gtk-3.0/settings.ini"
 }
diff --git a/gtk3/gtk3.install b/gtk3/gtk3.install
index 5dca450..9e70a7e 100644
--- a/gtk3/gtk3.install
+++ b/gtk3/gtk3.install
@@ -1,7 +1,7 @@
 post_install() {
     sbin/ldconfig -r .
 
-    extra/usr/bin/gtk-query-immodules-3.0 --update-cache &>/dev/null
+    usr/bin/gtk-query-immodules-3.0 --update-cache &>/dev/null
     usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas &>/dev/null
 }
 
@@ -11,7 +11,7 @@ post_upgrade() {
 
 pre_remove() {
     rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache &>/dev/null
-    rm -f extra/usr/lib/gtk-3.0/3.0.0/immodules.cache &>/dev/null
+    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache &>/dev/null
 }
 post_remove() {
     sbin/ldconfig -r .
diff --git a/gtkmm/PKGBUILD b/gtkmm/PKGBUILD
index 76879bb..361ee43 100644
--- a/gtkmm/PKGBUILD
+++ b/gtkmm/PKGBUILD
@@ -1,10 +1,10 @@
 pkgbase=gtkmm
 pkgname=('gtkmm')
 pkgver=2.24.2
-pkgrel=5
+pkgrel=6
 pkgdesc="C++ bindings for gtk2"
 arch=('x86_64')
-depends=('gtk2' 'pangomm' 'atkmm' 'filesystem-extra')
+depends=('gtk2' 'pangomm' 'atkmm')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
@@ -14,7 +14,7 @@ md5sums=('388a63ffc40cc8e208df9a1732a67d2d')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/extra/usr --disable-documentation
+  ./configure --prefix=/usr --disable-documentation
   make
 }
 
diff --git a/gtkspell/PKGBUILD b/gtkspell/PKGBUILD
index 94e61a5..a71e912 100644
--- a/gtkspell/PKGBUILD
+++ b/gtkspell/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=gtkspell
 pkgver=2.0.16
-pkgrel=2
+pkgrel=3
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
 arch=('x86_64')
 license=('GPL')
-depends=('gtk2' 'enchant' 'filesystem-extra')
+depends=('gtk2' 'enchant')
 makedepends=('intltool')
 options=('!libtool')
 install=gtkspell.install
@@ -14,7 +14,7 @@ md5sums=('f75dcc9338f182c571b321d37c606a94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/extra/usr --disable-gtk-doc	
+  ./configure --prefix=/usr --disable-gtk-doc	
   make
 }
 
diff --git a/ibus-m17n/PKGBUILD b/ibus-m17n/PKGBUILD
index 6b8ae5f..acbe2f2 100644
--- a/ibus-m17n/PKGBUILD
+++ b/ibus-m17n/PKGBUILD
@@ -1,7 +1,7 @@
 
 pkgname=ibus-m17n
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc='M17N engine for IBus'
 arch=('x86_64')
 url='http://code.google.com/p/ibus/'
@@ -14,8 +14,8 @@ build() {
   cd ${pkgname}-${pkgver}
 
   ./configure  \
-	  --prefix=/extra/usr \
-	  --libexecdir=/extra/usr/lib/ibus
+	  --prefix=/usr \
+	  --libexecdir=/usr/lib/ibus
 
   make
 }
diff --git a/ibus-qt/PKGBUILD b/ibus-qt/PKGBUILD
index 282a93f..5f7abcf 100644
--- a/ibus-qt/PKGBUILD
+++ b/ibus-qt/PKGBUILD
@@ -1,7 +1,7 @@
 
 pkgname=ibus-qt
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='IBus qt library and IBus qt input method plugin'
 arch=('x86_64')
 license=('LGPL')
@@ -16,7 +16,7 @@ build() {
   mkdir build
   cd build
   
-  cmake .. -DCMAKE_INSTALL_PREFIX=/extra/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
diff --git a/ibus/PKGBUILD b/ibus/PKGBUILD
index 62f6bb2..83bf8bc 100755
--- a/ibus/PKGBUILD
+++ b/ibus/PKGBUILD
@@ -1,7 +1,7 @@
 
 pkgname=ibus
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation Input Bus for Linux, IBus qt library and IBus qt input method plugin included"
 arch=('x86_64')
 url="http://ibus.googlecode.com"
@@ -17,8 +17,8 @@ build() {
   cd ${pkgname}-${pkgver}
   export PYTHON=python2
   ./configure \
-    --prefix=/extra/usr \
-    --libexecdir=/extra/usr/lib/ibus \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ibus \
     --sysconfdir=/etc \
     --disable-gconf \
     --disable-dconf \
diff --git a/ibus/ibus.install b/ibus/ibus.install
index 5288948..9f1b067 100755
--- a/ibus/ibus.install
+++ b/ibus/ibus.install
@@ -1,10 +1,10 @@
 post_install() {
-    /extra/usr/bin/gtk-query-immodules-2.0 > extra/etc/gtk-2.0/gtk.immodules
-    /extra/usr/bin/gtk-query-immodules-3.0 --update-cache 
+    /usr/bin/gtk-query-immodules-2.0 > extra/etc/gtk-2.0/gtk.immodules
+    /usr/bin/gtk-query-immodules-3.0 --update-cache 
 
-    /extra/usr/bin/gtk-update-icon-cache -fq -t extra/usr/share/icons/hicolor
+    /usr/bin/gtk-update-icon-cache -fq -t extra/usr/share/icons/hicolor
 
-    /extra/usr/bin/glib-compile-schemas /extra/usr/share/glib-2.0/schemas
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_remove() {
diff --git a/inkscape/PKGBUILD b/inkscape/PKGBUILD
index 41410bd..cab8213 100644
--- a/inkscape/PKGBUILD
+++ b/inkscape/PKGBUILD
@@ -1,13 +1,13 @@
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('x86_64')
 makedepends=('boost' 'intltool')
 depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
-         'python2' 'desktop-file-utils' 'hicolor-icon-theme' 'libwpg' 'filesystem-extra')
+         'python2' 'desktop-file-utils' 'hicolor-icon-theme' 'libwpg')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
@@ -35,7 +35,7 @@ prepare() {
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
-		--prefix=/extra/usr \
+		--prefix=/usr \
 		--with-python \
 		--with-perl \
 		--enable-lcms \
diff --git a/jamin/PKGBUILD b/jamin/PKGBUILD
index 695d87a..f8e3ebc 100644
--- a/jamin/PKGBUILD
+++ b/jamin/PKGBUILD
@@ -2,9 +2,9 @@
  
 pkgname=jamin
 pkgver=0.95.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A JACK Audio Connection Kit Audio Mastering interface"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://jamin.sourceforge.net/"
 license=('GPL')
 depends=('jack' 'libxml2' 'gtk2' 'swh-plugins' 'fftw' 'liblo')
@@ -15,8 +15,12 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkg
 md5sums=('032f2a4a578a8938f76282112d56c8d6')
  
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./configure --prefix=/extra/usr --mandir=/extra/usr/share
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --mandir=/usr/share
 	make CFLAGS="${CFLAGS} -ldl"
-	make DESTDIR=${pkgdir} install
 }
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
\ No newline at end of file
diff --git a/jamin/jamin.install b/jamin/jamin.install
index c832056..0676dd2 100644
--- a/jamin/jamin.install
+++ b/jamin/jamin.install
@@ -1,5 +1,5 @@
 post_install() {
-  /usr/bin/update-mime-database /extra/usr/share/mime
+  /usr/bin/update-mime-database /usr/share/mime
 }
 
 pre_upgrade() {
diff --git a/libgnomecanvas/PKGBUILD b/libgnomecanvas/PKGBUILD
index 8bd3b65..5e9eb70 100644
--- a/libgnomecanvas/PKGBUILD
+++ b/libgnomecanvas/PKGBUILD
@@ -1,10 +1,10 @@
 pkgname=libgnomecanvas
 pkgver=2.30.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Canvas library"
-arch=(x86_64)
+arch=('x86_64')
 license=('LGPL')
-depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20' 'filesystem-extra')
+depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20')
 makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url="http://www.gnome.org"
@@ -13,7 +13,7 @@ sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/extra/usr --disable-static \
+  ./configure --prefix=/usr --disable-static \
       --enable-glade 
   make 
 }
diff --git a/libgnomecanvasmm/PKGBUILD b/libgnomecanvasmm/PKGBUILD
index 5779add..b8526bc 100644
--- a/libgnomecanvasmm/PKGBUILD
+++ b/libgnomecanvasmm/PKGBUILD
@@ -1,10 +1,10 @@
 pkgname=libgnomecanvasmm
 pkgver=2.26.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ wrapper for libgnomecanvas."
 arch=('x86_64')
 license=('LGPL')
-depends=('gtkmm' 'libgnomecanvas' 'filesystem-extra')
+depends=('gtkmm' 'libgnomecanvas')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
@@ -13,7 +13,7 @@ md5sums=('a148c99311d46397de6e4a31736771ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/extra/usr --sysconfdir=/extra/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var
   make
 }
diff --git a/libwebkit-gtk2/PKGBUILD b/libwebkit-gtk2/PKGBUILD
index 4072279..0d3567d 100644
--- a/libwebkit-gtk2/PKGBUILD
+++ b/libwebkit-gtk2/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=libwebkit-gtk2
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="An opensource web content engine"
 arch=('x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'ruby' 'filesystem-extra')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'ruby')
 provides=('libwebkit')
 options=('!emptydirs')
 install=libwebkit.install
@@ -27,7 +27,7 @@ build() {
   sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in
 
 
-  PYTHON=/usr/bin/python2 ./configure --prefix=/extra/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --enable-introspection \
     --disable-geolocation \
     --with-font-backend=freetype --disable-gtk-doc \
@@ -45,5 +45,5 @@ build() {
 
 package() {
   cd "$srcdir/webkitgtk-$pkgver"
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/nvidia-settings/PKGBUILD b/nvidia-settings/PKGBUILD
index d9b697d..9ef610a 100644
--- a/nvidia-settings/PKGBUILD
+++ b/nvidia-settings/PKGBUILD
@@ -4,9 +4,9 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-settings')
 pkgdesc="Gtk Graphical User Interface for nVidia"
-depends=('gtk2' 'pangox-compat' 'filesystem-extra')
+depends=('gtk2' 'pangox-compat')
 pkgver=313.30
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -24,13 +24,13 @@ build() {
 package() {
   cd "${srcdir}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
-  install -D -m755 nvidia-settings "${pkgdir}/extra/usr/bin/nvidia-settings"
-  install -D -m644 nvidia-settings.1.gz "${pkgdir}/extra/usr/share/man/man1/nvidia-settings.1.gz"
-  install -D -m644 nvidia-settings.desktop "${pkgdir}/extra/usr/share/applications/nvidia-settings.desktop"
-  install -D -m644 nvidia-settings.png "${pkgdir}/extra/usr/share/pixmaps/nvidia-settings.png"
-  sed -e 's:__UTILS_PATH__:/extra/usr/bin:' -e 's:__PIXMAP_PATH__:/extra/usr/share/pixmaps:' -i "${pkgdir}/extra/usr/share/applications/nvidia-settings.desktop"
+  install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings"
+  install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz"
+  install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
+  install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
+  sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
 
   # Install the autostart .desktop file, so that parameters saved through nvidia-settings
   # are automatically reloaded at each login
-  install -D -m644 "${srcdir}/nvidia-restore-settings.desktop" "${pkgdir}/extra/etc/xdg/autostart/nvidia-restore-settings.desktop"
+  install -D -m644 "${srcdir}/nvidia-restore-settings.desktop" "${pkgdir}/etc/xdg/autostart/nvidia-restore-settings.desktop"
 }
diff --git a/oxygen-gtk2/PKGBUILD b/oxygen-gtk2/PKGBUILD
index f3c627f..a5ce131 100644
--- a/oxygen-gtk2/PKGBUILD
+++ b/oxygen-gtk2/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=oxygen-gtk2
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Oxygen engine for GTK2, for better Qt/GKT+ integration."
 arch=('x86_64')
 url=("https://projects.kde.org/projects/playground/artwork/oxygen-gtk")
 license=('LGPL3' 'GPL')
 depends=('cairo')
-makedepends=('gcc' 'cmake' 'gtk2' 'filesystem-extra')
+makedepends=('gcc' 'cmake' 'gtk2')
 provides=('oxygen-gtk')
 conflicts=('oxygen-gtk')
 categories=('system')
@@ -21,7 +21,7 @@ build() {
 	mkdir build && cd build
 	cmake -DCMAKE_BUILD_TYPE=Release \
 	      -DCMAKE_SKIP_RPATH=ON \
-	      -DCMAKE_INSTALL_PREFIX=/extra/usr .. 
+	      -DCMAKE_INSTALL_PREFIX=/usr .. 
 	make
 }
 
diff --git a/oxygen-gtk3/PKGBUILD b/oxygen-gtk3/PKGBUILD
index 352a462..a0eb9c5 100644
--- a/oxygen-gtk3/PKGBUILD
+++ b/oxygen-gtk3/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=oxygen-gtk3
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Oxygen engine for GTK3, for better Qt/GKT+ integration."
 arch=('x86_64')
 url=("http://projects.kde.org/projects/playground/artwork/oxygen-gtk/")
 license=('LGPL3' 'GPL')
-depends=('gtk3' 'filesystem-extra')
+depends=('gtk3')
 makedepends=('gcc' 'cmake')
 categories=('system')
 groups=('gtk-integration')
@@ -18,7 +18,7 @@ build() {
 	rm -rf build
 	mkdir build && cd build
 	cmake -DCMAKE_BUILD_TYPE=Release \
-	      -DCMAKE_INSTALL_PREFIX=/extra/usr .. 
+	      -DCMAKE_INSTALL_PREFIX=/usr .. 
 	make
 }
 
diff --git a/pidgin/PKGBUILD b/pidgin/PKGBUILD
index 02f025a..4eb3b9d 100644
--- a/pidgin/PKGBUILD
+++ b/pidgin/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=('pidgin')
 pkgver=2.10.7
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 pkgdesc="Multi-protocol instant messaging client"
 url="http://pidgin.im/"
 license=('GPL')
 depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-         'hicolor-icon-theme' 'filesystem-extra')
+         'hicolor-icon-theme')
 makedepends=('nss' 'libsasl' 'libidn' 'python2' 'farstream' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
 optdepends=('aspell: for spelling correction')
@@ -29,8 +29,8 @@ build() {
     libpurple/purple-{remote,notifications-example,url-handler}
 
   ./configure \
-    --prefix=/extra/usr \
-    --sysconfdir=/extra/etc \
+    --prefix=/usr \
+    --sysconfdir=/etc \
     --disable-schemas-install \
     --disable-meanwhile \
     --disable-gnutls \
@@ -54,5 +54,5 @@ package(){
   # Remove files that are packaged in libpurle
   make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
 
-  install -Dm644 pidgin.desktop "$pkgdir"/extra/usr/share/applications/pidgin.desktop
+  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
 }
diff --git a/pygtk/PKGBUILD b/pygtk/PKGBUILD
index 2792ecb..7147b92 100644
--- a/pygtk/PKGBUILD
+++ b/pygtk/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for the GTK widget set"
 arch=('x86_64')
 license=('LGPL')
@@ -20,14 +20,14 @@ build() {
   #https://bugzilla.gnome.org/show_bug.cgi?id=623965
   patch -Np1 -i "${srcdir}/python27.patch"
 
-  PYTHON=/usr/bin/python2 ./configure --prefix=/extra/usr
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/extra/usr/share/pygtk/2.0/defs/"
+  install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 
-  sed -i -e 's#env python$#env python2#' "${pkgdir}"/extra/usr/lib/pygtk/2.0/{,demos/}*.py
+  sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py
 }
diff --git a/qtcurve-gtk2/PKGBUILD b/qtcurve-gtk2/PKGBUILD
index b36054e..3194d8f 100644
--- a/qtcurve-gtk2/PKGBUILD
+++ b/qtcurve-gtk2/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=qtcurve-gtk2
 pkgver=1.8.16
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('GPL')
 pkgdesc='QtCurve-Gtk2 Add-on for Gtk-integration.'
 url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('gtk2' 'filesystem-extra')
+depends=('gtk2')
 provides=('gtk-integration-engine-qtcurve')
 conflicts=('gtk-integration-engine-qtcurve')
 replaces=('gtk-integration-engine-qtcurve')
@@ -24,15 +24,11 @@ build() {
 
   cmake "${srcdir}/QtCurve-Gtk2-${pkgver}" \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/extra/usr 
+        -DCMAKE_INSTALL_PREFIX=/usr 
   make
 }
 
 package() {
   cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
- 
-  # Move engine to /extra
-  cp -rvf ${pkgdir}/usr/* ${pkgdir}/extra/usr
-  rm -rf ${pkgdir}/usr 
 }
diff --git a/swt-extra/PKGBUILD b/swt-extra/PKGBUILD
index 8ef0e4b..d6b8af1 100644
--- a/swt-extra/PKGBUILD
+++ b/swt-extra/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=swt-extra
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 _date=201209141800
 pkgdesc='An open source widget toolkit for Java'
 arch=('x86_64')
@@ -33,12 +33,12 @@ package() {
   cd ${srcdir}/src
 
   # Shared objects
-  export OUTPUT_DIR=${pkgdir}/extra/usr/lib
+  export OUTPUT_DIR=${pkgdir}/usr/lib
   install -dm755 ${OUTPUT_DIR} 
   make -f make_linux.mak install
 
   # SWT jar
   ant -f ../build-swt.xml jar
-  install -Dm755 ../swt.jar ${pkgdir}/extra/usr/share/java/swt-${pkgver}.jar
-  ln -s swt-${pkgver}.jar ${pkgdir}/extra/usr/share/java/swt.jar
+  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
+  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
 }
diff --git a/thunderbird-i18n/PKGBUILD b/thunderbird-i18n/PKGBUILD
index 8aa6406..85936d1 100644
--- a/thunderbird-i18n/PKGBUILD
+++ b/thunderbird-i18n/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=thunderbird-i18n
 pkgver=24.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Language pack for Thunderbird"
 arch=('any')
 url="http://www.mozilla.com/"
 license=('MPL' 'GPL')
-depends=("thunderbird>=$pkgver" 'filesystem-extra')
+depends=("thunderbird>=$pkgver")
 _languages=(
   'ar     "Arabic"'
   'ast    "Asturian"'
@@ -136,7 +136,7 @@ package() {
   for _lang in "${_languages[@]}"; do
     _locale=${_lang%% *}
     install -Dm644 thunderbird-i18n-$pkgver-${_locale}.xpi \
-      "$pkgdir/extra/usr/lib/thunderbird/extensions/langpack-${_locale}@thunderbird.mozilla.org.xpi"
+      "$pkgdir/usr/lib/thunderbird/extensions/langpack-${_locale}@thunderbird.mozilla.org.xpi"
   done
 }
 
diff --git a/thunderbird/PKGBUILD b/thunderbird/PKGBUILD
index d5250ae..cce7f8e 100644
--- a/thunderbird/PKGBUILD
+++ b/thunderbird/PKGBUILD
@@ -1,13 +1,12 @@
 pkgname=thunderbird
 pkgver=24.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('x86_64')
 license=('MPL' 'GPL')
 url="http://www.mozilla.org/thunderbird/"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify'
-         'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification' 'nspr'
-         'filesystem-extra')
+         'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification' 'nspr')
 makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 
              'gstreamer0.10-base-plugins')
 optdepends=('thunderbird-i18n: for multilanguage support'
@@ -35,7 +34,7 @@ build() {
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/extra/usr/lib/thunderbird"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
   export PYTHON="/usr/bin/python2"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -45,20 +44,20 @@ package() {
   cd comm-esr24
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir"/vendor.js "$pkgdir/extra/usr/lib/thunderbird/defaults/preferences/vendor.js"
+  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
       install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/extra/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
   done
 
   install -Dm644 "$srcdir/thunderbird.desktop" \
-      "$pkgdir/extra/usr/share/applications/thunderbird.desktop"
+      "$pkgdir/usr/share/applications/thunderbird.desktop"
 
-  rm -rf "$pkgdir"/extra/usr/lib/thunderbird/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/extra/usr/lib/thunderbird/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/extra/usr/lib/thunderbird/hyphenation"
+  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
   
   # We don't want the development stuff
-  rm -r "$pkgdir"/extra/usr/{include,lib/thunderbird-devel,share/idl}
+  #rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
 }
diff --git a/truecrypt/PKGBUILD b/truecrypt/PKGBUILD
index 2c26095..b262d21 100644
--- a/truecrypt/PKGBUILD
+++ b/truecrypt/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=truecrypt
 pkgver=7.1a
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
 arch=('i686' 'x86_64')
 license=('custom') # TrueCrypt License v2.6
-depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper' 'filesystem-extra')
+depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
 makedepends=('nasm')
 optdepends=('sudo: mounting encrypted volumes as nonroot users')
 conflicts=('truecrypt-utils')
@@ -39,12 +39,12 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-source"
 
   # Install Binary
-  install -D -m755 Main/${pkgname} "${pkgdir}/extra/usr/bin/${pkgname}"
+  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
 
   # Install Desktop file and Icon
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/extra/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/extra/usr/share/pixmaps/truecrypt.xpm"
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
 
   # Install License
-  install -D -m644 License.txt "${pkgdir}/extra/usr/share/licenses/${pkgname}/License.txt"
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
diff --git a/tuxguitar/PKGBUILD b/tuxguitar/PKGBUILD
index a89199e..2e193fa 100644
--- a/tuxguitar/PKGBUILD
+++ b/tuxguitar/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tuxguitar
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('x86_64')
@@ -27,7 +27,7 @@ build() {
   patch -p0 -i ${srcdir}/no-cairo.patch
 
   cd $srcdir/tuxguitar-src-$pkgver
-  export CLASSPATH=/extra/usr/share/java/swt.jar:$CLASSPATH
+  export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
 
   (cd TuxGuitar/ && ant)
   (cd TuxGuitar-alsa/ && ant)
@@ -84,57 +84,57 @@ build() {
 package() {
   cd $srcdir/tuxguitar-src-$pkgver
 
-  mkdir -p $pkgdir/extra/usr/share/tuxguitar
-  mkdir -p $pkgdir/extra/usr/bin
+  mkdir -p $pkgdir/usr/share/tuxguitar
+  mkdir -p $pkgdir/usr/bin
 
-  cp -r TuxGuitar/share $pkgdir/extra/usr/share/tuxguitar/
-  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/extra/usr/share/tuxguitar/share/plugins/`basename {}`' \;
-  mv $pkgdir/extra/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/extra/usr/share/tuxguitar/
-  cp TuxGuitar/tuxguitar $pkgdir/extra/usr/share/tuxguitar/
+  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
+  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
+  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
+  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
 
   # alsa
   pushd TuxGuitar-alsa/jni
-  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/extra/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
-  mkdir -p $pkgdir/extra/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/extra/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
+  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
   popd
 
   # oss
   pushd TuxGuitar-oss/jni
-  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/extra/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
-  mkdir -p $pkgdir/extra/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/extra/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
+  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
   popd
 
   # jack
   pushd TuxGuitar-jack/jni
-  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/extra/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
-  mkdir -p $pkgdir/extra/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/extra/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
+  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
   popd
 
   # fluidsynth
   pushd TuxGuitar-fluidsynth/jni
-  install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/extra/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
-  mkdir -p $pkgdir/extra/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/extra/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
+  install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so
   popd
 
   unset CLASSPATH
-  cd $pkgdir/extra/usr/bin
+  cd $pkgdir/usr/bin
   cat >tuxguitar << EOF
 #!/bin/sh
-export CLASSPATH=/extra/usr/share/java/swt.jar:\$CLASSPATH
-export LD_LIBRARY_PATH=/extra/usr/lib:/extra/usr/lib/tuxguitar:\$LD_LIBRARY_PATH
-cd /extra/usr/share/$pkgname
-exec /extra/usr/share/$pkgname/tuxguitar "\$1" "\$2" "\$3" "\$4" "\$5" "\$6" "\$7" "\$8" "\$9"
+export CLASSPATH=/usr/share/java/swt.jar:\$CLASSPATH
+export LD_LIBRARY_PATH=/usr/lib:/usr/lib/tuxguitar:\$LD_LIBRARY_PATH
+cd /usr/share/$pkgname
+exec /usr/share/$pkgname/tuxguitar "\$1" "\$2" "\$3" "\$4" "\$5" "\$6" "\$7" "\$8" "\$9"
 EOF
 
   chmod 755 tuxguitar
-  install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/extra/usr/share/mime/packages/tuxguitar.xml
-  install -D -m0644 $srcdir/tuxguitar.desktop $pkgdir/extra/usr/share/applications/tuxguitar.desktop
+  install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml
+  install -D -m0644 $srcdir/tuxguitar.desktop $pkgdir/usr/share/applications/tuxguitar.desktop
   
   # Oxygen theme
-  cp -rf $srcdir/TuxGuitar-Oxygen $pkgdir/extra/usr/share/tuxguitar/share/skins/
+  cp -rf $srcdir/TuxGuitar-Oxygen $pkgdir/usr/share/tuxguitar/share/skins/
 
 }
diff --git a/wireshark/PKGBUILD b/wireshark/PKGBUILD
index ba43674..282ad9e 100644
--- a/wireshark/PKGBUILD
+++ b/wireshark/PKGBUILD
@@ -2,11 +2,11 @@
 
 pkgname=wireshark
 pkgver=1.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A free network protocol analyzer for Unix/Linux and Windows'
 arch=('x86_64')
 license=('GPL2')
-depends=('libpcap' 'libcap' 'krb5' 'glib2' 'desktop-file-utils' 'hicolor-icon-theme' 'lua' 'libgcrypt' 'gtk2' 'filesystem-extra')
+depends=('libpcap' 'libcap' 'krb5' 'glib2' 'desktop-file-utils' 'hicolor-icon-theme' 'lua' 'libgcrypt' 'gtk2')
 makedepends=('bison' 'flex' 'bash' 'gnutls' 'python' 'portaudio')
 url='http://www.wireshark.org/'
 install=${pkgname}.install
@@ -19,7 +19,7 @@ build() {
   
   ./autogen.sh
   ./configure \
-      --prefix=/extra/usr \
+      --prefix=/usr \
       --with-ssl \
       --with-pcap \
       --with-libcap \
@@ -38,16 +38,16 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/extra/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/extra/usr/bin/dumpcap"
-  #rm "${pkgdir}/extra/usr/bin/wireshark"
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  #rm "${pkgdir}/usr/bin/wireshark"
 
   # Headers
-  install -dm755 "${pkgdir}"/extra/usr/include/${pkgname}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+  install -dm755 "${pkgdir}"/usr/include/${pkgname}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
 
-  install -m644 color.h config.h register.h "${pkgdir}/extra/usr/include/${pkgname}"
+  install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgname}"
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/extra/usr/include/${pkgname}/${d}
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgname}/${d}
   done
   
   
@@ -55,12 +55,12 @@ package() {
   #install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
     install -Dm644 image/hi${d}-app-wireshark.png  \
-                   "${pkgdir}/extra/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
   done
 
   for d in 16 24 32 48 64 128 256 ; do
     install -Dm644 image/WiresharkDoc-${d}.png \
-                   "${pkgdir}/extra/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
   done
-  install -Dm644 wireshark.desktop "${pkgdir}/extra/usr/share/applications/wireshark.desktop"
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
\ No newline at end of file
diff --git a/wireshark/wireshark.install b/wireshark/wireshark.install
index 5ecdfcc..203875c 100644
--- a/wireshark/wireshark.install
+++ b/wireshark/wireshark.install
@@ -10,7 +10,7 @@ post_install() {
     
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
 
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' extra/usr/bin/dumpcap
+    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
     echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
 }
 
@@ -19,7 +19,7 @@ post_upgrade() {
 
     /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
     
-    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' extra/usr/bin/dumpcap
+    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
diff --git a/wxgtk/PKGBUILD b/wxgtk/PKGBUILD
index b156917..58c5268 100644
--- a/wxgtk/PKGBUILD
+++ b/wxgtk/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'sdl' 'filesystem-extra')
+depends=('gtk2' 'gstreamer0.10-base' 'sdl')
 makedepends=('gstreamer0.10-base-plugins')
 install=install
 source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
@@ -13,7 +13,7 @@ sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
 
 build() {
   cd wx*-${pkgver}
-  ./configure --prefix=/extra/usr --libdir=/extra/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
     --with-sdl --disable-precomp-headers --without-gconf
@@ -26,5 +26,5 @@ package() {
   cd wx*-${pkgver}
   make DESTDIR="${pkgdir}" install
   make -C contrib/src DESTDIR="${pkgdir}" install
-  install -D -m644 docs/licence.txt "${pkgdir}/extra/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/wxmaxima/PKGBUILD b/wxmaxima/PKGBUILD
index 66fbab7..0ffc750 100644
--- a/wxmaxima/PKGBUILD
+++ b/wxmaxima/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=wxmaxima
 pkgver=13.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('x86_64')
 url="http://wxmaxima.sourceforge.net/"
 license=('GPL2')
-depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils' 'filesystem-extra')
+depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
 install=wxmaxima.install
 sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c')
@@ -13,7 +13,7 @@ sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c')
 build() {
   cd "${srcdir}/wxMaxima-${pkgver}"
   
-  ./configure --prefix=/extra/usr
+  ./configure --prefix=/usr
   make
 }
 
@@ -26,8 +26,8 @@ package() {
   sed -i -e 's/Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;/Science;Math;/' wxmaxima.desktop
 
   # Install desktop file and icon
-  install -m755 -d "${pkgdir}/extra/usr/share/applications"
-  install -m755 -d "${pkgdir}/extra/usr/share/pixmaps"
-  install -m644 wxmaxima.desktop "${pkgdir}/extra/usr/share/applications/" 
-  install -m644 data/wxmaxima.png "${pkgdir}/extra/usr/share/pixmaps/" 
+  install -m755 -d "${pkgdir}/usr/share/applications"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 wxmaxima.desktop "${pkgdir}/usr/share/applications/" 
+  install -m644 data/wxmaxima.png "${pkgdir}/usr/share/pixmaps/" 
 }