diff -pruN 1.0+2017-09-16-1/debian/changelog 1.0+2017-09-16-1ubuntu1/debian/changelog
--- 1.0+2017-09-16-1/debian/changelog	2019-01-13 11:59:09.000000000 +0000
+++ 1.0+2017-09-16-1ubuntu1/debian/changelog	2022-07-19 18:27:54.000000000 +0000
@@ -1,3 +1,15 @@
+pgcharts (1.0+2017-09-16-1ubuntu1) kinetic; urgency=medium
+
+  * d/patches: fix SBCL compilation errors.
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Tue, 19 Jul 2022 15:27:54 -0300
+
+pgcharts (1.0+2017-09-16-1build1) kinetic; urgency=medium
+
+  * No change rebuild for sbcl ppc64el bootstrap.
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Tue, 19 Jul 2022 14:55:59 -0300
+
 pgcharts (1.0+2017-09-16-1) unstable; urgency=medium
 
   * Team upload with new upstream snapshot.
diff -pruN 1.0+2017-09-16-1/debian/control 1.0+2017-09-16-1ubuntu1/debian/control
--- 1.0+2017-09-16-1/debian/control	2019-01-13 11:59:09.000000000 +0000
+++ 1.0+2017-09-16-1ubuntu1/debian/control	2022-07-19 18:27:54.000000000 +0000
@@ -1,6 +1,7 @@
 Source: pgcharts
 Priority: optional
-Maintainer: Dimitri Fontaine <dim@tapoueh.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dimitri Fontaine <dim@tapoueh.org>
 Build-Depends:
  buildapp (>= 1.5),
  cl-alexandria,
diff -pruN 1.0+2017-09-16-1/debian/patches/0001-fix-sbcl-compilation-errors.patch 1.0+2017-09-16-1ubuntu1/debian/patches/0001-fix-sbcl-compilation-errors.patch
--- 1.0+2017-09-16-1/debian/patches/0001-fix-sbcl-compilation-errors.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.0+2017-09-16-1ubuntu1/debian/patches/0001-fix-sbcl-compilation-errors.patch	2022-07-19 18:27:54.000000000 +0000
@@ -0,0 +1,39 @@
+From 9b9549c53cca77039e8aaca18bce939ecb2b6549 Mon Sep 17 00:00:00 2001
+From: Riktam <ruirrs@gmail.com>
+Date: Mon, 1 Jun 2020 21:03:32 +0200
+Subject: Fix Issue #29 Error in compilation repeated &AUX in lambda list (#31)
+
+* Update package.lisp
+
+Fix compilation errors on newer SBCL and CCL.
+
+* Update dburi.lisp
+
+Fix compilation error on SBCL.
+Macro expansion generated 2 &aux spacifiers on one lambda argument list.
+
+Origin: upstream, https://github.com/dimitri/pgcharts/commit/9b9549c53cca77039e8aaca18bce939ecb2b6549
+---
+ src/utils/dburi.lisp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils/dburi.lisp b/src/utils/dburi.lisp
+index cb00748..1d1ee08 100644
+--- a/src/utils/dburi.lisp
++++ b/src/utils/dburi.lisp
+@@ -19,10 +19,10 @@
+   (:text t))
+ 
+ (defrule dsn-port (and ":" (* (digit-char-p character)))
+-  (:destructure (colon digits &aux (port (coerce digits 'string)))
++  (:destructure (colon digits)
+ 		(declare (ignore colon))
+ 		(list :port (if (null digits) digits
+-				(parse-integer port)))))
++				(parse-integer (coerce digits 'string))))))
+ 
+ (defrule doubled-at-sign (and "@@") (:constant "@"))
+ (defrule doubled-colon   (and "::") (:constant ":"))
+-- 
+2.36.1
+
diff -pruN 1.0+2017-09-16-1/debian/patches/0002-fix-name-conficts.patch 1.0+2017-09-16-1ubuntu1/debian/patches/0002-fix-name-conficts.patch
--- 1.0+2017-09-16-1/debian/patches/0002-fix-name-conficts.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.0+2017-09-16-1ubuntu1/debian/patches/0002-fix-name-conficts.patch	2022-07-19 18:27:54.000000000 +0000
@@ -0,0 +1,27 @@
+From e32c66eb93b1f651c66df972cabfed2f984cd0f5 Mon Sep 17 00:00:00 2001
+From: Riktam <ruirrs@gmail.com>
+Date: Mon, 1 Jun 2020 21:02:24 +0200
+Subject: [PATCH] Update package.lisp (#30)
+
+Fix compilation errors on newer SBCL and CCL.
+
+Origin: upstream, https://github.com/dimitri/pgcharts/commit/e32c66eb93b1f651c66df972cabfed2f984cd0f5
+---
+ src/package.lisp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/package.lisp b/src/package.lisp
+index 1cbd9e6..cb3ed12 100644
+--- a/src/package.lisp
++++ b/src/package.lisp
+@@ -18,6 +18,7 @@
+         #:cl-who
+         #:pgcharts.dburi
+         #:pgcharts.sql)
++  (:shadowing-import-from #:postmodern #:read-queries)
+   (:import-from #:alexandria
+                 #:read-file-into-string
+                 #:read-file-into-byte-vector)
+-- 
+2.36.1
+
diff -pruN 1.0+2017-09-16-1/debian/patches/series 1.0+2017-09-16-1ubuntu1/debian/patches/series
--- 1.0+2017-09-16-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1.0+2017-09-16-1ubuntu1/debian/patches/series	2022-07-19 18:27:54.000000000 +0000
@@ -0,0 +1,2 @@
+0001-fix-sbcl-compilation-errors.patch
+0002-fix-name-conficts.patch