diff -Nru libguestfs-1.44.1/debian/changelog libguestfs-1.44.1/debian/changelog
--- libguestfs-1.44.1/debian/changelog	2021-04-08 07:41:22.000000000 +0000
+++ libguestfs-1.44.1/debian/changelog	2021-04-09 12:31:02.000000000 +0000
@@ -1,10 +1,12 @@
-libguestfs (1:1.44.1-1ubuntu2) hirsute; urgency=medium
+libguestfs (1:1.44.1-1ubuntu3) hirsute; urgency=medium
 
+  * debian/patches/c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch:
+  * debian/patches/afe7e16c0fa1329751f12f700331b386eb21d6a4.patch:
   * debian/patches/95de3f6c50feea52abf2794945e741674df620b1.patch:
-    - upstream build fix for new golang
+    - use upstream approach to fix the build
   * Disable lto in rules file
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 08 Apr 2021 09:41:22 +0200
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 09 Apr 2021 14:31:02 +0200
 
 libguestfs (1:1.44.1-1ubuntu1) hirsute; urgency=low
 
diff -Nru libguestfs-1.44.1/debian/patches/afe7e16c0fa1329751f12f700331b386eb21d6a4.patch libguestfs-1.44.1/debian/patches/afe7e16c0fa1329751f12f700331b386eb21d6a4.patch
--- libguestfs-1.44.1/debian/patches/afe7e16c0fa1329751f12f700331b386eb21d6a4.patch	1970-01-01 00:00:00.000000000 +0000
+++ libguestfs-1.44.1/debian/patches/afe7e16c0fa1329751f12f700331b386eb21d6a4.patch	2021-04-09 12:31:02.000000000 +0000
@@ -0,0 +1,27 @@
+From afe7e16c0fa1329751f12f700331b386eb21d6a4 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 9 Apr 2021 14:24:52 +0100
+Subject: [PATCH] golang: Fix build when libguestfs is not already installed.
+
+See similar fix in libnbd:
+https://gitlab.com/nbdkit/libnbd/-/commit/031aaefaa8f78513d76913a54b362044667a4370
+
+Fixes: commit 95de3f6c50feea52abf2794945e741674df620b1
+---
+ golang/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/golang/Makefile.am b/golang/Makefile.am
+index 54ece2a30..6eb56a9c3 100644
+--- a/golang/Makefile.am
++++ b/golang/Makefile.am
+@@ -40,7 +40,8 @@ if HAVE_GOLANG
+ 
+ all-local: $(source_files)
+ 	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src
+-	cd src/$(pkg) && $(GOLANG) build
++	cd src/$(pkg) && \
++	    $(abs_top_builddir)/run $(GOLANG) build
+ 
+ TESTS_ENVIRONMENT = pkg=$(pkg) $(top_builddir)/run $(VG) # --test
+ 
diff -Nru libguestfs-1.44.1/debian/patches/c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch libguestfs-1.44.1/debian/patches/c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch
--- libguestfs-1.44.1/debian/patches/c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch	1970-01-01 00:00:00.000000000 +0000
+++ libguestfs-1.44.1/debian/patches/c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch	2021-04-09 12:31:02.000000000 +0000
@@ -0,0 +1,23 @@
+From c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 9 Apr 2021 11:05:17 +0100
+Subject: [PATCH] golang: Try to deal with srcdir != builddir builds.
+
+Updates: commit 95de3f6c50feea52abf2794945e741674df620b1
+Thanks: Gianfranco Costamagna
+---
+ golang/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/golang/Makefile.am b/golang/Makefile.am
+index 7b84d3c34..ee4743fbd 100644
+--- a/golang/Makefile.am
++++ b/golang/Makefile.am
+@@ -39,6 +39,7 @@ EXTRA_DIST = \
+ if HAVE_GOLANG
+ 
+ all-local: $(source_files)
++	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src
+ 	cd src/$(pkg) && $(GOLANG) build
+ 
+ TESTS_ENVIRONMENT = pkg=$(pkg) $(top_builddir)/run $(VG) # --test
diff -Nru libguestfs-1.44.1/debian/patches/golang-1.16.patch libguestfs-1.44.1/debian/patches/golang-1.16.patch
--- libguestfs-1.44.1/debian/patches/golang-1.16.patch	2021-04-08 07:41:22.000000000 +0000
+++ libguestfs-1.44.1/debian/patches/golang-1.16.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-Description: https://github.com/libguestfs/libguestfs/issues/65
-Origin: https://gitlab.com/nbdkit/libnbd/-/commit/78b09170fd5ca228f1f8b59f8643d0f5ad728473
-
---- libguestfs-1.44.1.orig/golang/Makefile.am
-+++ libguestfs-1.44.1/golang/Makefile.am
-@@ -21,6 +21,7 @@ include $(top_srcdir)/subdir-rules.mk
- pkg = libguestfs.org/guestfs
- 
- source_files = \
-+	src/$(pkg)/go.mod \
- 	src/$(pkg)/guestfs.go \
- 	src/$(pkg)/guestfs_*_test.go
- 
-@@ -37,17 +38,8 @@ EXTRA_DIST = \
- 
- if HAVE_GOLANG
- 
--golangpkgdir = $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/$(pkg)
--golangsrcdir = $(GOROOT)/src/pkg/$(pkg)
--
--golangpkg_DATA = \
--	pkg/$(GOOS)_$(GOARCH)/$(pkg).a
--
--pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
--	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src
--	$(top_builddir)/run $(GOLANG) install $(pkg)
--
--golangsrc_DATA = $(source_files)
-+all-local: $(source_files)
-+	-[ $(srcdir) != $(builddir) ] && ln -s $(abs_srcdir)/src $(builddir)/src && cd src/$(pkg) && $(GOLANG) build
- 
- TESTS_ENVIRONMENT = pkg=$(pkg) $(top_builddir)/run $(VG) # --test
- 
---- /dev/null
-+++ libguestfs-1.44.1/golang/src/libguestfs.org/guestfs/go.mod
-@@ -0,0 +1,3 @@
-+module main
-+replace libguestfs.org/guestfs => ../../src/libguestfs.org/guestfs
-+require libguestfs.org/guestfs v1.0.0
---- libguestfs-1.44.1.orig/m4/guestfs-golang.m4
-+++ libguestfs-1.44.1/m4/guestfs-golang.m4
-@@ -26,14 +26,6 @@ AS_IF([test "x$enable_golang" != "xno"],
-         AC_MSG_CHECKING([if $GOLANG is usable])
-         AS_IF([$GOLANG run $srcdir/golang/config-test.go 2>&AS_MESSAGE_LOG_FD],[
-             AC_MSG_RESULT([yes])
--
--            # Substitute some golang environment.
--            GOOS=`$GOLANG env GOOS`
--            GOARCH=`$GOLANG env GOARCH`
--            GOROOT=`$GOLANG env GOROOT`
--            AC_SUBST([GOOS])
--            AC_SUBST([GOARCH])
--            AC_SUBST([GOROOT])
-         ],[
-             AC_MSG_RESULT([no])
-             AC_MSG_WARN([golang ($GOLANG) is installed but not usable])
---- libguestfs-1.44.1.orig/run.in
-+++ libguestfs-1.44.1/run.in
-@@ -178,8 +178,6 @@ export LUA_CPATH
- 
- # For golang.
- export GOLANG="@GOLANG@"
--prepend GOPATH "$b/golang"
--export GOPATH
- if [ -z "$CGO_CFLAGS" ]; then
-     CGO_CFLAGS="-I$s/include"
- else
diff -Nru libguestfs-1.44.1/debian/patches/series libguestfs-1.44.1/debian/patches/series
--- libguestfs-1.44.1/debian/patches/series	2021-04-08 07:41:22.000000000 +0000
+++ libguestfs-1.44.1/debian/patches/series	2021-04-09 12:31:02.000000000 +0000
@@ -18,5 +18,6 @@
 0019-Add-support-for-YARA-4.patch
 0019-Fix-out-of-tree-build-for-po.patch
 0020-Update-packagelist-as-haxdump-has-been-moved-to-bsde.patch
-golang-1.16.patch
-#95de3f6c50feea52abf2794945e741674df620b1.patch
+95de3f6c50feea52abf2794945e741674df620b1.patch
+c8cab6219ff9e0feeb31a9fd18d3ff8f2a9c5de5.patch
+afe7e16c0fa1329751f12f700331b386eb21d6a4.patch