2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 724dd4654400..04b4ed4d7a15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May 17 19:00:35 UTC 2016
+# Tue May 17 19:11:37 UTC 2016
 pkgbase = madx-dev
 	pkgdesc = Accelerator Optics simulation code, latest development release
 	pkgver = 5.02.10
-	pkgrel = 1
+	pkgrel = 2
 	url = http://cern.ch/mad
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index fdd421a97f38..b3364adebbdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=madx-dev
 pkgver=5.02.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Accelerator Optics simulation code, latest development release"
 url="http://cern.ch/mad"
 license=("custom")
@@ -54,6 +54,8 @@ check() {
 package() {
     cd ${srcdir}/build
     make DESTDIR=${pkgdir} install
+    # resolve conflict with 'ndiff' from package 'nmap':
+    mv ${pkgdir}/usr/bin/n{,um}diff
 
     cd ${srcdir}/${sources}
     install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt