diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile
index b2ec73ad14f8..60e5f6dec60b 100644
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	urbackup-client
 DISTVERSION=	2.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION}/
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
-USES=		dos2unix gettext localbase pkgconfig
+USES=		autoreconf dos2unix gettext localbase pkgconfig
 USE_RC_SUBR=	urbackup_client
 
 USERS=		urbackup
@@ -38,18 +38,9 @@ GUI_CONFIGURE_OFF=	--enable-headless
 
 CONFFILES=	mariadbdump.conf \
 		mariadbxtrabackup.conf \
-		mariadbdump.conf \
 		postgresbase.conf \
 		postgresqldump.conf
 
-XPMFILES=	backup-bad.xpm \
-		backup-no-recent.xpm \
-		backup-ok.xpm \
-		backup-progress.xpm \
-		backup-indexing.xpm \
-		backup-no-server.xpm \
-		backup-progress-pause.xpm
-
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -E -e 's|[[:<:]]byte[[:>:]]|CryptoPP::byte|g' \
 		cryptoplugin/AESDecryption.cpp \
@@ -63,60 +54,21 @@ post-patch:
 		md5.h \
 	)
 
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
-	${MKDIR} ${STAGEDIR}/var/urbackup/data
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
-
-	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \
-		${STAGEDIR}${PREFIX}/bin
-
-	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientbackend \
-		${STAGEDIR}${PREFIX}/sbin
-
-	(cd ${WRKSRC}/urbackupclient/backup_scripts && 	${COPYTREE_BIN} . \
-		${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf")
-
+post-stage:
 	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
 		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample
 
 	${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf
 
-.for f in ${CONFFILES}
-	${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \
-		${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
-.endfor
-
-	${INSTALL_DATA} ${WRKSRC}/client/data/updates_h.dat \
-		${STAGEDIR}${PREFIX}/share/urbackup
-
 	${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 
-do-install-GUI-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientgui \
-		${STAGEDIR}${PREFIX}/bin
-
-	${INSTALL_DATA}	${WRKSRC}/client/data/logo1.png \
-		${STAGEDIR}${PREFIX}/share/urbackup
-
-	${INSTALL_DATA}	${WRKSRC}/client/info.txt \
-		${STAGEDIR}${PREFIX}/share/urbackup
-
-.for f in ${XPMFILES}
-	${INSTALL_DATA} ${WRKSRC}/client/data/${f} \
-		${STAGEDIR}${PREFIX}/share/urbackup
+.for f in ${CONFFILES}
+	${MV} ${STAGEDIR}${PREFIX}/etc/urbackup/${f} ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
 .endfor
 
-.for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/lang/${f}
-.endfor
-
-.for f in it pl pt_BR sk zh_TW zh_CN de es fr ru uk da nl fa cs
-	${INSTALL_DATA} ${WRKSRC}/client/data/lang/${f}/urbackup.mo \
-		${STAGEDIR}${PREFIX}/share/urbackup/lang/${f}
-.endfor
+	${RM} ${STAGEDIR}/var/urbackup/version.txt
+	${RM} ${STAGEDIR}${PREFIX}/share/urbackup/urbackup_ecdsa409k1.pub
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-client/files/patch-Makefile.am b/archivers/urbackup-client/files/patch-Makefile.am
new file mode 100644
index 000000000000..7737c5758c79
--- /dev/null
+++ b/archivers/urbackup-client/files/patch-Makefile.am
@@ -0,0 +1,45 @@
+Makefile.am uses ${INSTALL_PROGAM} to install scripts and configuation files,
+leading to an error from strip(1). This patch instead uses ${INSTALL} (for scripts)
+and ${INSTALL_DATA} (for configuration files).
+
+--- Makefile.am.orig	2018-08-27 01:45:13 UTC
++++ Makefile.am
+@@ -119,22 +119,22 @@ endif
+ 	$(MKDIR_P) "$(DESTDIR)$(datadir)/urbackup/scripts"
+ 	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/urbackup"
+ 	
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
+-	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
+-	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump"
+-	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
+-	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup"
+ 	
+ 	for script in "$(DESTDIR)$(datadir)/urbackup/scripts/"*; do sed "s|SYSCONFDIR|$(sysconfdir)/urbackup|g" "$$script" > "$$script.r"; mv "$$script.r" "$$script"; done
+ 	chmod 700 "$(DESTDIR)$(datadir)/urbackup/scripts/"*
diff --git a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
index e4ca0d5de8e2..93e7f9551e1c 100644
--- a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
+++ b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
@@ -1,10 +1,10 @@
 Build fails on FreeBSD due to a casting error from the wxString Class when using
-wx30-gtk2-3.0.4_1. This patch adds a cast (static_cast<const wchar_t*>) that 
+wx30-gtk2-3.0.4_1. This patch adds a cast (static_cast<const wchar_t*>) that
 resolves the error.
 
---- client/ConfigPath.cpp.orig	2018-08-09 00:18:20.807732000 +0000
-+++ client/ConfigPath.cpp	2018-08-09 00:19:21.531197000 +0000
-@@ -60,7 +60,7 @@
+--- client/ConfigPath.cpp.orig	2018-08-12 19:17:13 UTC
++++ client/ConfigPath.cpp
+@@ -60,7 +60,7 @@ ConfigPath::ConfigPath(wxWindow* parent)
  		listbox->Append(dirs[i].path);
  		if(dirs[i].name.IsEmpty())
  		{
@@ -13,7 +13,7 @@ resolves the error.
  		}
  	}
  
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ void ConfigPath::OnClickNew(wxCommandEve
  		listbox->Append(ed.GetPath() );
  		SBackupDir ad;
  		ad.path=ed.GetPath();
diff --git a/archivers/urbackup-client/files/patch-client_stringtools.cpp b/archivers/urbackup-client/files/patch-client_stringtools.cpp
index 7ab109093d15..6a5cd19571b7 100644
--- a/archivers/urbackup-client/files/patch-client_stringtools.cpp
+++ b/archivers/urbackup-client/files/patch-client_stringtools.cpp
@@ -2,9 +2,28 @@ Build fails on FreeBSD due to urbackup's local definitions of isnumber()
 conflicting with a library function. This patch renames the port's definition to
 resolve the conflict. Analogous changes are also made in client/stringtools.h
 
---- client/stringtools.cpp.orig	2018-08-09 00:15:57.062820000 +0000
-+++ client/stringtools.cpp	2018-08-09 00:16:38.573398000 +0000
-@@ -825,7 +825,7 @@
+--- client/stringtools.cpp.orig	2018-08-12 19:17:45 UTC
++++ client/stringtools.cpp
+@@ -486,12 +486,12 @@ std::string nconvert(s32 i){
+ 	ss << i;
+ 	return ss.str();
+ }
+-
+-std::string nconvert(int long i) {
+-	ostringstream ss;
+-	ss << i;
+-	return ss.str();
+-}
++
++std::string nconvert(int long i) {
++	ostringstream ss;
++	ss << i;
++	return ss.str();
++}
+ 
+ #if defined(_WIN64) || defined(_LP64)
+ std::string nconvert(unsigned int i){
+@@ -825,7 +825,7 @@ void TokenizeMail(std::string& str, std:
  //--------------------------------------------------------------------
  /**
  */
@@ -13,7 +32,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
  {
  	if( ch>=48 && ch <=57 )
  		return true;
-@@ -848,7 +848,7 @@
+@@ -848,7 +848,7 @@ bool isletter(char ch)
  //--------------------------------------------------------------------
  /**
  */
@@ -22,7 +41,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
  {
  	if( ch>=48 && ch <=57 )
  		return true;
-@@ -928,7 +928,7 @@
+@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
  	bool start=false;
  	for(size_t i=0;i<pStr.size();++i)
  	{
@@ -31,7 +50,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
  		{
  			num+=pStr[i];
  			start=true;
-@@ -1445,7 +1445,7 @@
+@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string 
  {
  	for(size_t i=0;i<str.size();++i)
  	{
@@ -40,7 +59,7 @@ resolve the conflict. Analogous changes are also made in client/stringtools.h
  		{
  			str[i]=rch;
  		}
-@@ -1497,4 +1497,4 @@
+@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
  		}
  	}
  	return ret;
diff --git a/archivers/urbackup-client/files/patch-client_stringtools.h b/archivers/urbackup-client/files/patch-client_stringtools.h
index dc63f04bbfd5..7fecba55dc64 100644
--- a/archivers/urbackup-client/files/patch-client_stringtools.h
+++ b/archivers/urbackup-client/files/patch-client_stringtools.h
@@ -1,10 +1,10 @@
-Build fails on FreeBSD due to urbackup's local definitions of isnumber() 
-conflicting with a library function. This patch renames the port's definition to 
+Build fails on FreeBSD due to urbackup's local definitions of isnumber()
+conflicting with a library function. This patch renames the port's definition to
 resolve the conflict. Analogous changes are also made in client/stringtools.cpp
 
---- client/stringtools.h.orig	2018-08-09 00:27:09.254786000 +0000
-+++ client/stringtools.h	2018-08-09 00:27:23.137354000 +0000
-@@ -69,9 +69,9 @@
+--- client/stringtools.h.orig	2018-08-12 19:18:09 UTC
++++ client/stringtools.h
+@@ -69,9 +69,9 @@ std::wstring replaceonce(std::wstring to
  void Tokenize(std::string& str, std::vector<std::string> &tokens, std::string seps);
  void Tokenize(std::wstring& str, std::vector<std::wstring> &tokens, std::wstring seps);
  void TokenizeMail(std::string& str, std::vector<std::string> &tokens, std::string seps);
diff --git a/archivers/urbackup-client/pkg-plist b/archivers/urbackup-client/pkg-plist
index 1f8adbd6e897..e75498c5121d 100644
--- a/archivers/urbackup-client/pkg-plist
+++ b/archivers/urbackup-client/pkg-plist
@@ -24,8 +24,6 @@ share/urbackup/scripts/setup-postgresbackup
 @sample etc/urbackup/urbackupclient.conf.sample
 etc/newsyslog.conf.d/urbackupclient.conf
 share/urbackup/updates_h.dat
-%%GUI%%share/urbackup/info.txt
-%%GUI%%share/urbackup/logo1.png
 %%GUI%%share/urbackup/backup-bad.xpm
 %%GUI%%share/urbackup/backup-indexing.xpm
 %%GUI%%share/urbackup/backup-no-recent.xpm
@@ -33,6 +31,7 @@ share/urbackup/updates_h.dat
 %%GUI%%share/urbackup/backup-ok.xpm
 %%GUI%%share/urbackup/backup-progress-pause.xpm
 %%GUI%%share/urbackup/backup-progress.xpm
+%%GUI%%share/urbackup/info.txt
 %%GUI%%share/urbackup/lang/cs/urbackup.mo
 %%GUI%%share/urbackup/lang/da/urbackup.mo
 %%GUI%%share/urbackup/lang/de/urbackup.mo
@@ -48,6 +47,7 @@ share/urbackup/updates_h.dat
 %%GUI%%share/urbackup/lang/uk/urbackup.mo
 %%GUI%%share/urbackup/lang/zh_CN/urbackup.mo
 %%GUI%%share/urbackup/lang/zh_TW/urbackup.mo
+%%GUI%%share/urbackup/logo1.png
 @dir(,,0700) /var/urbackup/data
 @dir(urbackup,urbackup,0755) /var/urbackup
 @mode 555