diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 6c0e8ec29..592ecdb19 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -6,26 +6,32 @@
 
 pkgname=swt
 # http://download.eclipse.org/eclipse/downloads/drops4
-pkgver=4.5
-pkgrel=1.1
-_date=201506032000
+pkgver=4.6
+pkgrel=1
+_date=201606061100
 pkgdesc='An open source widget toolkit for Java'
 arch=('i686' 'x86_64')
 url='http://www.eclipse.org/swt/'
 license=('EPL')
-depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
+depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst')
 optdepends=('libgnomeui' 'glu' 'webkitgtk2')
-makedepends=('java-environment' 'libxtst' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'webkitgtk2' 'apache-ant')
-source=(build-swt.xml)
-sha256sums=('6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923')
+makedepends=('java-environment=8' 'libxtst' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'webkitgtk2' 'apache-ant')
 
-if [[ $CARCH == "aarch64" ]]; then
-  source+=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
-  sha256sums+=('ce89cb9dea5bef927873cbc377a81b5d9f1995622e42402bd9600043a9bc00e3')
-else
-  source+=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
-  sha256sums+=('180cf993af914726e6da9abe669a636b057e9353058e76be7644b31955feb00e')
-fi
+source=(build-swt.xml)
+source_i686=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_x86_64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
+source_arm=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_armv6h=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_armv7h=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip)
+source_aarch64=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip)
+
+sha256sums=('3d30fbde25a6a6d260d04cb1782b7618c2a0a926440935a9eea516146eb0e1e1')
+sha256sums_i686=('3906ce9efa190b3f1d48988d507fa7d4fae8b3f92212a3bff4ba635e0c0cbd4a')
+sha256sums_x86_64=('fe5191cc087020e47efbbde1ff1b30b3b6e1a3a305e25efabb0937ad7b00cd72')
+sha256sums_arm=('3906ce9efa190b3f1d48988d507fa7d4fae8b3f92212a3bff4ba635e0c0cbd4a')
+sha256sums_armv6h=('3906ce9efa190b3f1d48988d507fa7d4fae8b3f92212a3bff4ba635e0c0cbd4a')
+sha256sums_armv7h=('3906ce9efa190b3f1d48988d507fa7d4fae8b3f92212a3bff4ba635e0c0cbd4a')
+sha256sums_aarch64=('fe5191cc087020e47efbbde1ff1b30b3b6e1a3a305e25efabb0937ad7b00cd72')
 
 # These examples don't even run anymore (Try Tux Guitar instead)!
 # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
@@ -37,14 +43,14 @@ build() {
   cd ${srcdir}
   unzip -oq src.zip -d src
 
-  export JAVA_HOME=/usr/lib/jvm/default
-  . /etc/profile.d/apache-ant.sh
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
 
   # Shared objects
   cd src
   ./build.sh
 
   # SWT jar
+  . /etc/profile.d/apache-ant.sh
   ant -f ../build-swt.xml compile
 }
 
diff --git a/extra/swt/build-swt.xml b/extra/swt/build-swt.xml
index a161204f8..9d1265e38 100644
--- a/extra/swt/build-swt.xml
+++ b/extra/swt/build-swt.xml
@@ -8,7 +8,7 @@
    </target>
 
    <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}" target="1.6" />
+      <javac srcdir="${src}" destdir="${build}" source="1.7" />
    </target>
 
    <target name="jar">