diff --git a/.SRCINFO b/.SRCINFO
index a0b95ed862b3..03e3ace629ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jlink-software-and-documentation
 	pkgdesc = Segger JLink software & documentation pack for Linux
 	pkgver = 7.00a
-	pkgrel = 0
+	pkgrel = 1
 	epoch = 36
 	url = https://www.segger.com/jlink-software.html
 	install = jlink-software-and-documentation.install
@@ -11,6 +11,7 @@ pkgbase = jlink-software-and-documentation
 	arch = aarch64
 	groups = jlink
 	license = custom
+	license = GPLv2
 	depends = glibc
 	depends = libudev0-shim
 	depends = patch
@@ -18,6 +19,7 @@ pkgbase = jlink-software-and-documentation
 	replaces = j-link-software-and-documentation
 	options = !strip
 	source = 99-jlink.rules.patch
+	source = 99-cmsis-dap.rules
 	source = JLink.svg
 	source = JFlashExe.desktop
 	source = JFlashLiteExe.desktop
@@ -38,6 +40,7 @@ pkgbase = jlink-software-and-documentation
 	source = JRunExe.desktop
 	source = JTAGLoadExe.desktop
 	md5sums = a57d93b791581c1f36e4c672303bb85d
+	md5sums = 1d90c97860d0da65525f77e80b821613
 	md5sums = 83a136d31b296dd8f0e23bc21f9d8e19
 	md5sums = 02e067cd1c420f2085216d76e4866cd4
 	md5sums = 50bced5895a0ec59db0146153a077515
diff --git a/99-cmsis-dap.rules b/99-cmsis-dap.rules
new file mode 100644
index 000000000000..33bc76c7f409
--- /dev/null
+++ b/99-cmsis-dap.rules
@@ -0,0 +1,19 @@
+# Copy this file to /etc/udev/rules.d/
+# If rules fail to reload automatically, you can refresh udev rules
+# with the command "udevadm control --reload"
+
+# This rules are based on the udev rules from the OpenOCD project, with unsupported probes removed.
+# See http://openocd.org/ for more details.
+#
+# This file is available under the GNU General Public License v2.0
+
+ACTION!="add|change", GOTO="cmsis_dap_rules_end"
+
+SUBSYSTEM=="gpio", MODE="0660", GROUP="plugdev", TAG+="uaccess"
+
+SUBSYSTEM!="usb|tty|hidraw", GOTO="cmsis_dap_rules_end"
+
+# CMSIS-DAP compatible adapters
+ATTRS{product}=="*CMSIS-DAP*", MODE="666", GROUP="plugdev", TAG+="uaccess"
+
+LABEL="cmsis_dap_rules_end"
diff --git a/PKGBUILD b/PKGBUILD
index d507bb71bfc3..870c51b270a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,18 @@
 
 pkgname=jlink-software-and-documentation
 pkgver=7.00a
-pkgrel=0
+pkgrel=1
 epoch=36
 pkgdesc="Segger JLink software & documentation pack for Linux"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64' )
-license=('custom')
+license=('custom' 'GPLv2')
 groups=('jlink')
 depends=('glibc' 'libudev0-shim' 'patch')
 source_x86_64=("JLink_Linux_${pkgver/./}_x86_64.tgz::https://www.segger.com/downloads/jlink/JLink_Linux_V${pkgver/./}_x86_64.tgz")
 source_i686=("JLink_Linux_${pkgver/./}_i686.tgz::https://www.segger.com/downloads/jlink/JLink_Linux_V${pkgver/./}_i386.tgz")
 source_armv7h=("JLink_Linux_${pkgver/./}_arm.tgz::https://www.segger.com/downloads/jlink/JLink_Linux_V${pkgver/./}_arm.tgz")
 source_aarch64=("JLink_Linux_${pkgver/./}_arm64.tgz::https://www.segger.com/downloads/jlink/JLink_Linux_V${pkgver/./}_arm64.tgz")
-source=("99-jlink.rules.patch" "JLink.svg")
+source=("99-jlink.rules.patch" "99-cmsis-dap.rules" "JLink.svg")
 desktops=(
         "JFlashExe.desktop"
         "JFlashLiteExe.desktop"
@@ -42,6 +42,7 @@ md5sums_armv7h=('0067d444170013e90b25216d8e4d55dd')
 md5sums_aarch64=('74a70590df463a53e4af44939da72c43')
 
 md5sums=("a57d93b791581c1f36e4c672303bb85d"
+         "1d90c97860d0da65525f77e80b821613"
          "83a136d31b296dd8f0e23bc21f9d8e19"
          "02e067cd1c420f2085216d76e4866cd4"
          "50bced5895a0ec59db0146153a077515"