diff --git a/Readme.md b/Readme.md
index f1d3fca..ab10a52 100644
--- a/Readme.md
+++ b/Readme.md
@@ -207,6 +207,8 @@ Create virtual panorama tours using panorama images.
 
 ## [panotour](panotour)
 
+**NOTE:** This software is no longer available from official sources.
+
 Create virtual panorama tours using panorama images.
 
 ### Homepage:
@@ -227,23 +229,23 @@ Create virtual panorama tours using panorama images. Professional version with a
 
 **FORMAT:** Arch Linux PKGBUILD script.
 
-## [photoscan](photoscan)
+## [metashape](metashape)
 
 Create textured 3D models from multiple still images.
 
 ### Homepage:
 
-[Agisoft - Photoscan](http://www.agisoft.com/)
+[Agisoft - Metashape](http://www.agisoft.com/)
 
 **FORMAT:** Arch Linux PKGBUILD script.
 
-## [photoscan-pro](photoscan-pro)
+## [metashape-pro](metashape-pro)
 
 Create textured 3D models from multiple still images. Professional version with additional features.
 
 ### Homepage:
 
-[Agisoft - Photoscan](http://www.agisoft.com/)
+[Agisoft - Metashape](http://www.agisoft.com/)
 
 **FORMAT:** Arch Linux PKGBUILD script.
 
diff --git a/metashape-pro/PKGBUILD b/metashape-pro/PKGBUILD
new file mode 100644
index 0000000..81aa3e2
--- /dev/null
+++ b/metashape-pro/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Pekka Helenius <fincer89 [at] hotmail [dot] com>
+
+pkgname=metashape-pro
+_pkgname=metashapepro
+pkgver=1.5.2
+ver=1_5_2
+pkgrel=1
+architecture=_amd64
+pkgdesc='Generate high resolution georeferenced orthophotos and textured polygonal models (trial version).'
+arch=('x86_64')
+url='http://www.agisoft.com/'
+license=('custom: "commercial"')
+depends=("libpng12")
+install=${pkgname}.install
+source=(
+  "http://download.agisoft.com/${pkgname}_${ver}$_$architecture.tar.gz"
+  "${pkgname}.runtime"
+  "${pkgname}.png" 
+  "${pkgname}.desktop"
+  "qtfix.patch"
+)
+md5sums=('70085f24165e1c84496ae25236906ed7'
+         'bd53c52a6f3eedd86574ee5e32d1c1a8'
+         '9ffa07f3059edce837d43de8c2a50e1b'
+         '72403a878fd2f555ce5d3bef507740e6'
+         '918a2cca7abaebec66c48ec97db0dea0')
+
+prepare(){
+  cd "${srcdir}/${pkgname}"
+  patch -Np1 -i $srcdir/qtfix.patch
+}         
+
+package(){
+  cd "${srcdir}/${pkgname}"
+  install -dm755 ${pkgdir}/opt/
+  cp -r ${srcdir}/${pkgname} ${pkgdir}/opt/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname}.runtime ${pkgdir}/usr/bin/${_pkgname}
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
diff --git a/photoscan-pro/photoscan-pro.desktop b/metashape-pro/metashape-pro.desktop
similarity index 100%
rename from photoscan-pro/photoscan-pro.desktop
rename to metashape-pro/metashape-pro.desktop
diff --git a/photoscan-pro/photoscan-pro.install b/metashape-pro/metashape-pro.install
similarity index 100%
rename from photoscan-pro/photoscan-pro.install
rename to metashape-pro/metashape-pro.install
diff --git a/photoscan-pro/photoscan-pro.png b/metashape-pro/metashape-pro.png
similarity index 100%
rename from photoscan-pro/photoscan-pro.png
rename to metashape-pro/metashape-pro.png
diff --git a/metashape-pro/metashape-pro.runtime b/metashape-pro/metashape-pro.runtime
new file mode 100644
index 0000000..2058415
--- /dev/null
+++ b/metashape-pro/metashape-pro.runtime
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd /opt/metashape-pro/
+./metashape.sh $@
diff --git a/photoscan-pro/qtfix.patch b/metashape-pro/qtfix.patch
similarity index 84%
rename from photoscan-pro/qtfix.patch
rename to metashape-pro/qtfix.patch
index c9dd552..271e7e8 100644
--- a/photoscan-pro/qtfix.patch
+++ b/metashape-pro/qtfix.patch
@@ -1,5 +1,5 @@
---- a/photoscan.sh
-+++ b/photoscan.sh
+--- a/metashape.sh
++++ b/metashape.sh
 @@ -7,7 +7,7 @@
  if [ "${dirname%$tmp}" != "/" ]; then
  dirname=$PWD/$dirname
diff --git a/metashape/PKGBUILD b/metashape/PKGBUILD
new file mode 100644
index 0000000..d99a5ac
--- /dev/null
+++ b/metashape/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Pekka Helenius <fincer89 [at] hotmail [dot] com>
+
+pkgname=metashape
+pkgver=1.5.2
+ver=1_5_2
+pkgrel=1
+architecture=_amd64
+pkgdesc='Build professional quality textured 3D models from still images (trial version).'
+arch=('x86_64')
+url='http://www.agisoft.com/'
+license=('custom: "commercial"')
+depends=("libpng12")
+install=${pkgname}.install
+source=(
+  "http://download.agisoft.com/${pkgname}_${ver}$_$architecture.tar.gz"
+  "${pkgname}.runtime"
+  "${pkgname}.png" 
+  "${pkgname}.desktop"
+)
+md5sums=('cf0a08ea66825b894873aff440eedfd7'
+         '19dcbf9bdcef22ec63349ffafbad1245'
+         '9ffa07f3059edce837d43de8c2a50e1b'
+         '22918632e8683049cd06e6d70b7e2ff8')
+
+package(){
+  cd "${srcdir}/$_pkgname"
+  install -dm755 ${pkgdir}/opt/
+  cp -r ${srcdir}/${pkgname} ${pkgdir}/opt/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname}.runtime ${pkgdir}/usr/bin/${pkgname}
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}
diff --git a/photoscan/photoscan.desktop b/metashape/metashape.desktop
similarity index 100%
rename from photoscan/photoscan.desktop
rename to metashape/metashape.desktop
diff --git a/photoscan/photoscan.install b/metashape/metashape.install
similarity index 100%
rename from photoscan/photoscan.install
rename to metashape/metashape.install
diff --git a/photoscan/photoscan.png b/metashape/metashape.png
similarity index 100%
rename from photoscan/photoscan.png
rename to metashape/metashape.png
diff --git a/metashape/metashape.runtime b/metashape/metashape.runtime
new file mode 100644
index 0000000..ae42ff5
--- /dev/null
+++ b/metashape/metashape.runtime
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd /opt/metashape/
+./metashape.sh $@
diff --git a/pano2vr/.AURINFO b/pano2vr/.AURINFO
deleted file mode 100644
index 7b15bf3..0000000
--- a/pano2vr/.AURINFO
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgbase = pano2vr
-	pkgdesc = Converts panoramic images into QuickTime VR or Macromedia Flash formats.
-	pkgver = 4.5.1
-	pkgrel = 1
-	url = http://gardengnomesoftware.com/pano2vr.php
-	arch = x86_64
-	license = Pano2VR
-	depends = libgl
-	depends = qt4
-	depends = qtwebkit
-	source = http://gardengnomesoftware.com/download/pano2vr/pano2vr_linux64_4_5_1.tar.gz
-	source = changedir.patch
-	source = pano2vr.desktop
-
-pkgname = pano2vr
-
diff --git a/panotour/panotour.tar.gz b/panotour/panotour.tar.gz
deleted file mode 100644
index 62bd52e..0000000
Binary files a/panotour/panotour.tar.gz and /dev/null differ
diff --git a/photoscan-pro/PKGBUILD b/photoscan-pro/PKGBUILD
deleted file mode 100644
index eed55ed..0000000
--- a/photoscan-pro/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Fincer <fincer89 at hotmail dot com>
-pkgname=photoscan-pro
-pkgver=1.3.0
-ver=1_3_0
-pkgrel=1
-pkgdesc='Generate high resolution georeferenced orthophotos and textured polygonal models (trial version).'
-arch=('x86_64')
-url='http://www.agisoft.com/'
-license=('custom: "commercial"')
-depends=('libpng12' 'qt5-svg' 'qt5-base' 'python')
-install=photoscan-pro.install
-  architecture=_amd64
-  source=("http://download.agisoft.com/photoscan-pro_$ver$_$architecture.tar.gz" "$pkgname.runtime" "$pkgname.png" "$pkgname.desktop"
-  qtfix.patch)
-md5sums=('82aaed64f623dc91d6129014412c8c7a'
-         '2f29afffc98fa39ae0f5c47fe7195833'
-         '9ffa07f3059edce837d43de8c2a50e1b'
-         '72403a878fd2f555ce5d3bef507740e6'
-         '4cb2792c78ac526aaf1fa5c233a74fb0')
-
-prepare(){
-  cd "$srcdir/$pkgname"
-  patch -Np1 -i $srcdir/qtfix.patch #qtfix126.patch is for Photoscan Pro version 1.2.6 (Linux AMD64)
-}
-         
-package(){
-  install -dm755 $pkgdir/opt/
-  cp -r $srcdir/$pkgname $pkgdir/opt/$pkgname
-  install -Dm755 $srcdir/$pkgname.runtime $pkgdir/usr/bin/photoscanpro
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  chmod 755 -R $pkgdir/opt/$pkgname
-}
diff --git a/photoscan-pro/photoscan-pro.runtime b/photoscan-pro/photoscan-pro.runtime
deleted file mode 100644
index 4517c1a..0000000
--- a/photoscan-pro/photoscan-pro.runtime
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /opt/photoscan-pro/
-./photoscan.sh $@
diff --git a/photoscan-pro/qtfix126.patch b/photoscan-pro/qtfix126.patch
deleted file mode 100644
index 5a178ab..0000000
--- a/photoscan-pro/qtfix126.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/photoscan.sh
-+++ b/photoscan.sh
-@@ -7,6 +7,7 @@
- if [ "${dirname%$tmp}" != "/" ]; then
- dirname=$PWD/$dirname
- fi
-+unset QT_PLUGIN_PATH
- LD_LIBRARY_PATH=$dirname
- export LD_LIBRARY_PATH
- "$dirname/$appname" "$@"
diff --git a/photoscan/PKGBUILD b/photoscan/PKGBUILD
deleted file mode 100644
index 2f3b7f2..0000000
--- a/photoscan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Fincer <fincer89 at hotmail dot com>
-pkgname=photoscan
-pkgver=1.3.0
-ver=1_3_0
-pkgrel=1
-pkgdesc='Build professional quality textured 3D models from still images (trial version).'
-arch=('x86_64')
-url='http://www.agisoft.com/'
-license=('custom: "commercial"')
-depends=("libpng12")
-install=photoscan.install
-  architecture=_amd64
-  source=("http://download.agisoft.com/photoscan_$ver$_$architecture.tar.gz" "$pkgname.runtime" "$pkgname.png" "$pkgname.desktop")
-md5sums=('a6ee33a1500a5ea0faebc37798bba6cd'
-         'abb5083f4b13ed9ed57b2966b2cace35'
-         '9ffa07f3059edce837d43de8c2a50e1b'
-         '22918632e8683049cd06e6d70b7e2ff8')
-
-package(){
-  cd "$srcdir/$_pkgname"
-  install -dm755 $pkgdir/opt/
-  cp -r $srcdir/$pkgname $pkgdir/opt/$pkgname
-  install -Dm755 $srcdir/$pkgname.runtime $pkgdir/usr/bin/photoscan
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
diff --git a/photoscan/photoscan.runtime b/photoscan/photoscan.runtime
deleted file mode 100644
index 86decd6..0000000
--- a/photoscan/photoscan.runtime
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /opt/photoscan/
-./photoscan.sh $@