diff --git a/yed/.SRCINFO b/yed/.SRCINFO
new file mode 100644
index 0000000..bc5b9e0
--- /dev/null
+++ b/yed/.SRCINFO
@@ -0,0 +1,20 @@
+# Generated by mksrcinfo v8
+# Mon Mar 28 19:28:21 UTC 2016
+pkgbase = yed
+	pkgdesc = Very powerful graph editor written in java
+	pkgver = 3.15.0.2
+	pkgrel = 1
+	url = http://www.yworks.com/en/products_yed_about.html
+	install = yed.install
+	arch = any
+	license = custom
+	depends = java-runtime
+	source = http://www.yworks.com/products/yed/demo/yEd-3.15.0.2.zip
+	source = yed.desktop
+	source = yed
+	sha256sums = c60e4868f267303ee8b6fc2587beb4cc846f32bd8a6a557b77e01f0d8039aa4d
+	sha256sums = 342dba6defac88d035253b22e6377d9570858f59367cd486dba4a4dba1621f91
+	sha256sums = fee9aff48421fb51f623a371a9aa12c70f388a05f3015b6a3b7c9798312e8e8a
+
+pkgname = yed
+
diff --git a/yed/PKGBUILD b/yed/PKGBUILD
new file mode 100644
index 0000000..7e08a52
--- /dev/null
+++ b/yed/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Michael Lass <bevan@bi-co.net>
+# Contributor: Sebastian Wolf < sebastian at melonkru dot de >
+# Contributor: gost < gostrc at gmail dot com >
+# Contributor: Mikolaj Pastuszko <deluminathor@gmail.com>
+# Contributor: Stefan Seemayer < mail at semicolonsoftware dot de >
+# Contributor: Gordin < 9ordin @t gmail dot com >
+
+# This PKGBUILD is maintained on github:
+# https://github.com/michaellass/AUR
+
+pkgname=yed
+pkgver=3.16
+pkgrel=1
+pkgdesc='Very powerful graph editor written in java'
+arch=('any')
+url='http://www.yworks.com/en/products_yed_about.html'
+license=('custom')
+depends=('java-runtime')
+source=("http://www.yworks.com/resources/yed/demo/yEd-${pkgver}.zip"
+        'yed.desktop'
+        'yed')
+sha256sums=('1dc24758535ca033eb5f078524193c9ffcc98635d2832fd403ca9aec01e24bea'
+            '342dba6defac88d035253b22e6377d9570858f59367cd486dba4a4dba1621f91'
+            'fee9aff48421fb51f623a371a9aa12c70f388a05f3015b6a3b7c9798312e8e8a')
+
+install=${pkgname}.install
+
+package() {
+  # Install jars
+  install -Dm644 ${srcdir}/yed-${pkgver}/yed.jar ${pkgdir}/usr/share/yed/yed.jar
+  install -dm755 ${pkgdir}/usr/share/yed/lib
+  install -m644 ${srcdir}/yed-${pkgver}/lib/* ${pkgdir}/usr/share/yed/lib/
+
+  # Install license
+  install -Dm644 ${srcdir}/yed-${pkgver}/license.html ${pkgdir}/usr/share/licenses/yed/license.html
+
+  # Install icon
+  install -Dm644 ${srcdir}/yed-${pkgver}/icons/yicon32.png ${pkgdir}/usr/share/pixmaps/yed.png
+
+  # Install .desktop file
+  install -Dm644 ${srcdir}/yed.desktop ${pkgdir}/usr/share/applications/yed.desktop
+
+  # Install run script
+  install -Dm755 ${srcdir}/yed ${pkgdir}/usr/bin/yed
+}
diff --git a/yed/yed b/yed/yed
new file mode 100644
index 0000000..e763834
--- /dev/null
+++ b/yed/yed
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+java -jar /usr/share/yed/yed.jar "$@"
+
diff --git a/yed/yed.desktop b/yed/yed.desktop
new file mode 100644
index 0000000..6491a8b
--- /dev/null
+++ b/yed/yed.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Icon=yed
+Exec=yed %f
+StartupNotify=true
+StartupWMClass=B-A-A-B
+Name=yEd Graph Editor
+Categories=Application;Graphics;VectorGraphics;Java;
diff --git a/yed/yed.install b/yed/yed.install
new file mode 100644
index 0000000..cd0dfe2
--- /dev/null
+++ b/yed/yed.install
@@ -0,0 +1,13 @@
+post_upgrade() {
+	post_install $1
+}
+
+post_install() {
+	echo ">>> You have to read and accept the license agreement under"
+	echo ">>> /usr/share/licenses/yed/license.html before using yEd."
+}
+
+op=$1
+shift
+$op $*
+