diff -pruN 0.9.2-6/debian/changelog 0.9.2-6ubuntu1/debian/changelog
--- 0.9.2-6/debian/changelog	2018-02-26 12:13:57.000000000 +0000
+++ 0.9.2-6ubuntu1/debian/changelog	2018-11-18 03:50:48.000000000 +0000
@@ -1,3 +1,11 @@
+java2html (0.9.2-6ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/support-8-bit-charsets.patch: Apply patch from yens (getreu)
+      adding support for European 8-bit character sets.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 17 Nov 2018 22:50:48 -0500
+
 java2html (0.9.2-6) unstable; urgency=medium
 
   * QA upload.
@@ -5,6 +13,21 @@ java2html (0.9.2-6) unstable; urgency=me
 
  -- Adrian Bunk <bunk@debian.org>  Mon, 26 Feb 2018 14:13:57 +0200
 
+java2html (0.9.2-5ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild to pick up the shared flex library.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 20 Feb 2018 07:02:14 +0000
+
+java2html (0.9.2-5ubuntu1) artful; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Apply patch from yens (getreu) adding support for European 8-bit
+      character sets.
+  * Convert the delta to a quilt patch.
+
+ -- Logan Rosen <logan@ubuntu.com>  Wed, 10 May 2017 01:07:44 -0400
+
 java2html (0.9.2-5) unstable; urgency=medium
 
   * QA upload.
@@ -15,6 +38,13 @@ java2html (0.9.2-5) unstable; urgency=me
 
  -- Andreas Beckmann <anbe@debian.org>  Sat, 10 Dec 2016 15:09:55 +0100
 
+java2html (0.9.2-4ubuntu1) oneiric; urgency=low
+
+  * Apply patch from yens (getreu) adding support for European 8-bit
+    character sets. (LP: #626271)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Thu, 28 Jul 2011 17:26:45 -0400
+
 java2html (0.9.2-4) unstable; urgency=low
 
   * Package adoption; set maintainer to Paul Cager.
@@ -94,3 +124,4 @@ java2html (0.4-1) unstable; urgency=low
   * Initial Release.
 
  -- Jaldhar H. Vyas <jaldhar@debian.org>  Fri,  2 Apr 1999 12:38:39 -0500
+
diff -pruN 0.9.2-6/debian/control 0.9.2-6ubuntu1/debian/control
--- 0.9.2-6/debian/control	2018-02-26 12:12:25.000000000 +0000
+++ 0.9.2-6ubuntu1/debian/control	2018-02-26 16:31:24.000000000 +0000
@@ -1,7 +1,8 @@
 Source: java2html
 Section: web
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Standards-Version: 3.7.2
 Build-Depends:
  debhelper (>= 5),
diff -pruN 0.9.2-6/debian/patches/series 0.9.2-6ubuntu1/debian/patches/series
--- 0.9.2-6/debian/patches/series	2018-02-26 12:09:11.000000000 +0000
+++ 0.9.2-6ubuntu1/debian/patches/series	2018-11-18 03:50:45.000000000 +0000
@@ -1,2 +1,3 @@
 all.patch
 libfl.patch
+support-8-bit-charsets.patch
diff -pruN 0.9.2-6/debian/patches/support-8-bit-charsets.patch 0.9.2-6ubuntu1/debian/patches/support-8-bit-charsets.patch
--- 0.9.2-6/debian/patches/support-8-bit-charsets.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.9.2-6ubuntu1/debian/patches/support-8-bit-charsets.patch	2017-05-10 05:07:44.000000000 +0000
@@ -0,0 +1,43 @@
+Description: add support for European 8-bit character sets
+Author: Jens Getreu <getreu@web.de>
+Bug-Debian: https://bugs.debian.org/229364
+Bug-Ubuntu: https://launchpad.net/bugs/626271
+Last-Update: 2017-05-10
+
+--- java2html-0.9.2.orig/java2html.l
++++ java2html-0.9.2/java2html.l
+@@ -42,7 +42,7 @@ unsigned int oldstate = 0;
+ %s DEFINELINE
+ %s PREPROLINE
+ 
+-id [a-zA-Z_][a-zA-Z01-9_]*
++id [a-zA-Z_\xa0-\xff][a-zA-Z01-9\xa0-\xff]*
+ wsnl [\t \n]*
+ ws   [\t ]*
+ accessmode ("public"|"private"|"protected")
+--- java2html-0.9.2.orig/mymain.c
++++ java2html-0.9.2/mymain.c
+@@ -552,6 +552,7 @@ AddLabelForFunction(FILE *out, char *tex
+   while (((('A' <= *start_ptr) && ('Z' >= *start_ptr))
+ 	  || (('a' <= *start_ptr) && ('z' >= *start_ptr))
+ 	  || (('0' <= *start_ptr) && ('9' >= *start_ptr))
++	  || (('\xa0' <= *start_ptr) && ('\xff' >= *start_ptr))
+ 	  || ('_' == *start_ptr))
+ 	 && (start_ptr != text))
+     { start_ptr--; }
+@@ -582,6 +583,7 @@ AddLabelForClass(FILE *out, char *text)
+   while (((('A' <= *end_ptr) && ('Z' >= *end_ptr))
+ 	      || (('a' <= *end_ptr) && ('z' >= *end_ptr))
+ 	  || (('0' <= *end_ptr) && ('9' >= *end_ptr))
++	  || (('\xa0' <= *end_ptr) && ('\xff' >= *end_ptr))
+ 	  || ('_' == *end_ptr)))
+     { end_ptr++; }
+   AddLabelTag(out, start_ptr, end_ptr);
+@@ -610,6 +612,7 @@ AddLabelForStruct(FILE *out, char *text)
+   while (((('A' <= *end_ptr) && ('Z' >= *end_ptr))
+ 	  || (('a' <= *end_ptr) && ('z' >= *end_ptr))
+ 	  || (('0' <= *end_ptr) && ('9' >= *end_ptr))
++	  || (('\xa0' <= *end_ptr) && ('\xff' >= *end_ptr))
+ 	  || ('_' == *end_ptr)))
+     { end_ptr++; }
+   AddLabelTag(out, start_ptr, end_ptr);