diff -Nru hyperic-sigar-1.6.4+dfsg/debian/changelog hyperic-sigar-1.6.4+dfsg/debian/changelog
--- hyperic-sigar-1.6.4+dfsg/debian/changelog	2021-08-27 06:12:29.000000000 +0000
+++ hyperic-sigar-1.6.4+dfsg/debian/changelog	2021-11-09 06:30:02.000000000 +0000
@@ -1,3 +1,19 @@
+hyperic-sigar (1.6.4+dfsg-7) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+  * Switching to version 4 for debian/watch.
+
+ -- Andrius Merkys <merkys@debian.org>  Tue, 09 Nov 2021 01:30:02 -0500
+
+hyperic-sigar (1.6.4+dfsg-6) experimental; urgency=medium
+
+  * Team upload.
+  * Disabling cc -m64 cc flag on all architectures (Closes: #997807).
+  * Renaming no-m64-mips-arm.diff -> no-m64.patch.
+
+ -- Andrius Merkys <merkys@debian.org>  Mon, 25 Oct 2021 02:02:47 -0400
+
 hyperic-sigar (1.6.4+dfsg-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64-mips-arm.diff hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64-mips-arm.diff
--- hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64-mips-arm.diff	2021-08-27 05:10:18.000000000 +0000
+++ hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64-mips-arm.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Index: hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
-===================================================================
---- hyperic-sigar-1.6.4+dfsg.orig/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java	2014-11-03 13:25:30.620030459 +0800
-+++ hyperic-sigar-1.6.4+dfsg/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java	2014-11-03 13:25:30.608030459 +0800
-@@ -75,7 +75,8 @@
-         if (ArchName.is64()) {
-             getProject().setProperty("jni.arch64", "true");
-             if (ArchLoader.IS_LINUX) {
--                if (!osArch.equals("ia64")) {
-+                if (!osArch.equals("ia64") && !osArch.equals("mips64el")
-+                      && !osArch.equals("mips64") && !osArch.equals("aarch64")) {
-                     getProject().setProperty("jni.gccm", "-m64");
-                 }
-             }
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64.patch hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64.patch
--- hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64.patch	1970-01-01 00:00:00.000000000 +0000
+++ hyperic-sigar-1.6.4+dfsg/debian/patches/no-m64.patch	2021-10-25 06:02:00.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Removing cc -m64 flag to fix build on mips64el, mips64, aarch64
+ and riscv64 (Closes: #997807). Thanks Aurelien Jarno.
+Author: Andrius Merkys <merkys@debian.org>
+--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
++++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+@@ -74,11 +74,11 @@
+ 
+         if (ArchName.is64()) {
+             getProject().setProperty("jni.arch64", "true");
+-            if (ArchLoader.IS_LINUX) {
++            /* if (ArchLoader.IS_LINUX) {
+                 if (!osArch.equals("ia64")) {
+                     getProject().setProperty("jni.gccm", "-m64");
+                 }
+-            }
++            } */
+         }
+         else {
+             if (ArchLoader.IS_LINUX && osArch.equals("s390")) {
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/patches/series hyperic-sigar-1.6.4+dfsg/debian/patches/series
--- hyperic-sigar-1.6.4+dfsg/debian/patches/series	2021-08-27 05:48:00.000000000 +0000
+++ hyperic-sigar-1.6.4+dfsg/debian/patches/series	2021-10-25 05:56:27.000000000 +0000
@@ -2,7 +2,7 @@
 0002-bindings-java-fix-java-build-script.patch
 0003-bindings-java-Use-sane-name-for-JNI-library.patch
 0004-make-the-package-compile-on-MIPS.patch
-no-m64-mips-arm.diff
+no-m64.patch
 ftbfs-glibc-2.28.diff
 fix-undefined-symbols.patch
 rpc.patch
diff -Nru hyperic-sigar-1.6.4+dfsg/debian/watch hyperic-sigar-1.6.4+dfsg/debian/watch
--- hyperic-sigar-1.6.4+dfsg/debian/watch	2021-08-27 05:10:18.000000000 +0000
+++ hyperic-sigar-1.6.4+dfsg/debian/watch	2021-11-09 06:26:30.000000000 +0000
@@ -1,5 +1,3 @@
-version=3
-
-opts=dversionmangle=s/\+dfsg.*$// \
-    http://sf.net/sigar/hyperic-sigar-(.*)-src\.tar\.gz
-
+version=4
+opts=dversionmangle=auto \
+ http://sf.net/sigar/hyperic-sigar-(.*)-src\.tar\.gz