diff -Nru libjsyntaxpane-java-0.9.6~r156/debian/changelog libjsyntaxpane-java-0.9.6~r156/debian/changelog
--- libjsyntaxpane-java-0.9.6~r156/debian/changelog	2016-01-03 02:04:10.000000000 +0100
+++ libjsyntaxpane-java-0.9.6~r156/debian/changelog	2018-05-19 12:27:05.000000000 +0200
@@ -1,3 +1,11 @@
+libjsyntaxpane-java (0.9.6~r156-6ubuntu1) bionic-updates; urgency=medium
+
+  * Fix java9 runtime crash by porting patches from -7 (LP: #1770809)
+  * Add myself to Uploaders:
+  * Update Vcs-* to point to salsa
+
+ -- Felix Natter <fnatter@gmx.net>  Sat, 19 May 2018 12:27:05 +0200
+
 libjsyntaxpane-java (0.9.6~r156-6) unstable; urgency=medium
 
   * Remove myself from the uploaders.
diff -Nru libjsyntaxpane-java-0.9.6~r156/debian/control libjsyntaxpane-java-0.9.6~r156/debian/control
--- libjsyntaxpane-java-0.9.6~r156/debian/control	2016-01-03 02:04:10.000000000 +0100
+++ libjsyntaxpane-java-0.9.6~r156/debian/control	2018-05-19 12:19:52.000000000 +0200
@@ -2,11 +2,12 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Felix Natter <fnatter@gmx.net>
 Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32), jflex
 Build-Depends-Indep: default-jdk
 Standards-Version: 3.9.4
-Vcs-Git: git://anonscm.debian.org/pkg-java/libjsyntaxpane-java.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libjsyntaxpane-java.git
+Vcs-Git: https://salsa.debian.org/java-team/libjsyntaxpane-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libjsyntaxpane-java
 Homepage: http://code.google.com/p/jsyntaxpane/
 
 Package: libjsyntaxpane-java
diff -Nru libjsyntaxpane-java-0.9.6~r156/debian/patches/disable-pom libjsyntaxpane-java-0.9.6~r156/debian/patches/disable-pom
--- libjsyntaxpane-java-0.9.6~r156/debian/patches/disable-pom	1970-01-01 01:00:00.000000000 +0100
+++ libjsyntaxpane-java-0.9.6~r156/debian/patches/disable-pom	2018-05-19 12:27:05.000000000 +0200
@@ -0,0 +1,89 @@
+Description: Simply patch out pom.xml in order to avoid triggering maven build system
+Author: Felix Natter <fnatter@gmx.net>
+Forwarded: not-needed
+Last-Update: 2018-06-23
+--- a/pom.xml
++++ /dev/null
+@@ -1,82 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <groupId>jsyntaxpane</groupId>
+-  <artifactId>jsyntaxpane</artifactId>
+-  <packaging>jar</packaging>
+-  <version>0.9.6</version>
+-  <name>jsyntaxpane</name>
+-  <description>A very simple to use and extend JEditorKit that supports few languages. The main goal is to make it easy to have nice looking Java Swing Editors with support for Syntax Highlighting.</description>
+-  <url>http://jsyntaxpane.googlecode.com/</url>
+-
+-  <licenses>
+-    <license>
+-      <name>The Apache Software License, Version 2.0</name>
+-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+-      <distribution>repo</distribution>
+-    </license>
+-  </licenses>
+-
+-  <scm>
+-    <url>http://jsyntaxpane.googlecode.com/svn/</url>
+-  </scm>
+-
+-  <pluginRepositories>
+-    <pluginRepository>
+-      <id>jflex</id>
+-      <name>JFlex repository</name>
+-      <url>http://jflex.sourceforge.net/repo/</url>
+-    </pluginRepository>
+-  </pluginRepositories>
+-  
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-compiler-plugin</artifactId>
+-        <version>2.3</version>
+-        <configuration>
+-          <source>1.6</source>
+-          <target>1.6</target>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>**/Thumbs.db</exclude>
+-          </excludes>        
+-          <archive>
+-            <manifest>
+-              <mainClass>jsyntaxpane.SyntaxTester</mainClass>
+-              <packageName>jsyntaxpane</packageName>
+-              <addClasspath>true</addClasspath>
+-              <classpathPrefix />
+-            </manifest>
+-            <manifestEntries>
+-              <mode>development</mode>
+-              <url>${pom.url}</url>
+-            </manifestEntries>
+-          </archive>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>de.jflex</groupId>
+-        <artifactId>maven-jflex-plugin</artifactId>
+-        <!--version>0.2</version-->
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>generate</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <properties>
+-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-  </properties>
+-
+-</project>
diff -Nru libjsyntaxpane-java-0.9.6~r156/debian/patches/java9-fix libjsyntaxpane-java-0.9.6~r156/debian/patches/java9-fix
--- libjsyntaxpane-java-0.9.6~r156/debian/patches/java9-fix	1970-01-01 01:00:00.000000000 +0100
+++ libjsyntaxpane-java-0.9.6~r156/debian/patches/java9-fix	2018-05-19 12:16:11.000000000 +0200
@@ -0,0 +1,100 @@
+Description: Fix issue with java9
+Author: Jacob Nordfalk <jacob.nordfalk@gmail.com>
+Origin: https://github.com/nordfalk/jsyntaxpane/commit/5fc75594f8bc4df6e8f7096d4a440490b768fd46
+Forwarded: not-needed
+Reviewed-by: Felix Natter <fnatter@gmx.net>
+Last-Update: 2018-04-24
+--- a/src/main/java/jsyntaxpane/CompoundUndoMan.java
++++ b/src/main/java/jsyntaxpane/CompoundUndoMan.java
+@@ -20,6 +20,7 @@
+ import javax.swing.undo.CompoundEdit;
+ import javax.swing.undo.UndoManager;
+ import javax.swing.undo.UndoableEdit;
++import javax.swing.undo.*;
+ 
+ /**
+  * A revised UndoManager that groups undos based on positions.  If the change is relatively next to the
+@@ -37,6 +38,8 @@
+  */
+ public class CompoundUndoMan extends UndoManager {
+ 
++     private final SyntaxDocument doc;
++    
+ 	private CompoundEdit compoundEdit;
+ 	// This allows us to start combining operations.
+ 	// it will be reset after the first change.
+@@ -46,6 +49,7 @@
+ 	private int	lastLine = -1;
+ 
+ 	public CompoundUndoMan(SyntaxDocument doc) {
++        	    this.doc = doc;
+ 		doc.addUndoableEditListener(this);
+ 		lastLine = doc.getStartPosition().getOffset();
+ 	}
+@@ -57,8 +61,8 @@
+ 	@Override
+ 	public void undoableEditHappened(UndoableEditEvent e) {
+ 		//  Start a new compound edit
+-
+-		AbstractDocument.DefaultDocumentEvent docEvt = (DefaultDocumentEvent) e.getEdit();
++	    
++	        //AbstractDocument.DefaultDocumentEvent docEvt = (DefaultDocumentEvent) e.getEdit();
+ 
+ 		if (compoundEdit == null) {
+ 			compoundEdit = startCompoundEdit(e.getEdit());
+@@ -66,6 +70,7 @@
+ 			return;
+ 		}
+ 
++		/*
+ 		int editLine = ((SyntaxDocument)docEvt.getDocument()).getLineNumberAt(docEvt.getOffset());
+ 
+ 		//  Check for an incremental edit or backspace.
+@@ -79,6 +84,38 @@
+ 
+ 		//  Not incremental edit, end previous edit and start a new one
+ 		lastLine = editLine;
++		*/
++
++		 if (e.getEdit() instanceof DefaultDocumentEvent) {
++		     // Java 6 to 8
++		     AbstractDocument.DefaultDocumentEvent docEvt = (DefaultDocumentEvent) e.getEdit();
++
++		     int editLine = doc.getLineNumberAt(docEvt.getOffset());
++
++		     //  Check for an incremental edit or backspace.
++		     //  The Change in Caret position and Document length should both be
++		     //  either 1 or -1.
++		     if ((startCombine || Math.abs(docEvt.getLength()) == 1) && editLine == lastLine) {
++			 compoundEdit.addEdit(e.getEdit());
++			 startCombine = false;
++			 //updateDirty();
++			 return;
++		     }
++
++		     //  Not incremental edit, end previous edit and start a new one
++		     lastLine = editLine;
++
++		 } else {
++		     // Java 9: It seems that all the edits are wrapped and we cannot get line number!
++		     // See https://github.com/netroby/jdk9-dev/blob/master/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java#L279
++		     // AbstractDocument.DefaultDocumentEventUndoableWrapper docEvt = e.getEdit();
++		     if (startCombine && !e.getEdit().isSignificant()) {
++			 compoundEdit.addEdit(e.getEdit());
++			 startCombine = false;
++			 //updateDirty();
++			 return;
++		     }
++		 }
+ 
+ 		compoundEdit.end();
+ 		compoundEdit = startCompoundEdit(e.getEdit());
+@@ -90,7 +127,7 @@
+ 	 */
+ 	private CompoundEdit startCompoundEdit(UndoableEdit anEdit) {
+ 		//  Track Caret and Document information of this compound edit
+-		AbstractDocument.DefaultDocumentEvent docEvt = (DefaultDocumentEvent) anEdit;
++		//AbstractDocument.DefaultDocumentEvent docEvt = (DefaultDocumentEvent) anEdit;
+ 
+ 		//  The compound edit is used to store incremental edits
+ 
diff -Nru libjsyntaxpane-java-0.9.6~r156/debian/patches/series libjsyntaxpane-java-0.9.6~r156/debian/patches/series
--- libjsyntaxpane-java-0.9.6~r156/debian/patches/series	2016-01-03 02:04:10.000000000 +0100
+++ libjsyntaxpane-java-0.9.6~r156/debian/patches/series	2018-05-19 12:16:19.000000000 +0200
@@ -2,3 +2,5 @@
 load-bundle-i18n
 scala-property-comments
 js-problem-java8
+java9-fix
+disable-pom