diff -Nru freerdp2-2.2.0+git202007201338/debian/changelog freerdp2-2.2.0+git202007201338/debian/changelog
--- freerdp2-2.2.0+git202007201338/debian/changelog	2020-07-30 18:52:13.000000000 +0000
+++ freerdp2-2.2.0+git202007201338/debian/changelog	2020-07-31 06:44:34.000000000 +0000
@@ -1,8 +1,8 @@
-freerdp2 (2.2.0+git202007201338-0+remmina202007301852.rd2ba84a.d9d7ae58~ubuntu16.04.1) xenial; urgency=low
+freerdp2 (2.2.0+git202007201338-0+remmina202007310644.rd2ba84a.dfabe85c~ubuntu16.04.1) xenial; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Thu, 30 Jul 2020 18:52:13 +0000
+ -- Giovanni Panozzo <giodev@panozzo.it>  Fri, 31 Jul 2020 06:44:34 +0000
 
 freerdp (2.1.1~git-0~remmina1.3) artful; urgency=medium
 
diff -Nru freerdp2-2.2.0+git202007201338/debian/git-build-recipe.manifest freerdp2-2.2.0+git202007201338/debian/git-build-recipe.manifest
--- freerdp2-2.2.0+git202007201338/debian/git-build-recipe.manifest	2020-07-30 18:52:13.000000000 +0000
+++ freerdp2-2.2.0+git202007201338/debian/git-build-recipe.manifest	2020-07-31 06:44:34.000000000 +0000
@@ -1,3 +1,3 @@
-# git-build-recipe format 0.4 deb-version 2.2.0+git202007201338-0+remmina202007301852.rd2ba84a.d9d7ae58
+# git-build-recipe format 0.4 deb-version 2.2.0+git202007201338-0+remmina202007310644.rd2ba84a.dfabe85c
 lp:~remmina-ppa-team/remmina-ppa/+git/FreeRDP git-commit:d2ba84a6885f57674098fe8e76c5f99d880e580d
-merge debian-files lp:~remmina-ppa-team/remmina-ppa/+git/GL-FreeRDP-Ubuntu-PPA git-commit:9d7ae584a1abac1a95435e83898e30cdd0d1a1ab
+merge debian-files lp:~remmina-ppa-team/remmina-ppa/+git/GL-FreeRDP-Ubuntu-PPA git-commit:fabe85c948ebe2d789438e24374e081776dd6737
diff -Nru freerdp2-2.2.0+git202007201338/debian/rules freerdp2-2.2.0+git202007201338/debian/rules
--- freerdp2-2.2.0+git202007201338/debian/rules	2020-07-30 18:52:13.000000000 +0000
+++ freerdp2-2.2.0+git202007201338/debian/rules	2020-07-31 06:44:34.000000000 +0000
@@ -37,7 +37,16 @@
                       $(NULL)
 endif
 
-DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) \
+# gcc on ubuntu 18.04 targeting at armhf is bugged when using -O2. Replace with -O1
+DEB_TARGET_ARCH?=$(shell dpkg-architecture -qDEB_TARGET_ARCH)
+ifneq (,$(filter armhf,$(DEB_TARGET_ARCH)))
+CMAKE_ARMHF_C_FLAGS = -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O1 -g -DNDEBUG"
+else
+CMAKE_ARMHF_C_FLAGS =
+endif
+
+DEB_CMAKE_EXTRA_FLAGS :=  ${CMAKE_ARMHF_C_FLAGS} \
+                          -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) \
                           -DCMAKE_SKIP_RPATH=FALSE \
                           -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
                           -DWITH_PULSE=ON \
@@ -62,11 +71,6 @@
 # Add FFmpeg and GSM support to Ubuntu
 DEB_CMAKE_EXTRA_FLAGS += -DWITH_FFMPEG=ON -DWITH_GSM=ON
 
-# gcc on ubuntu 18.04 targeting at armhf is bugged when using -O2. Replace with -O1
-DEB_TARGET_ARCH?=$(shell dpkg-architecture -qDEB_TARGET_ARCH)
-ifneq (,$(filter armhf,$(DEB_TARGET_ARCH)))
-DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_C_FLAGS="-O1 -g"
-endif
 
 %:
 	dh $@