diff --git a/debian/changelog b/debian/changelog
index 7b32c8f..a9778b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freehep-vectorgraphics (2.4+git20140902.1.25e9edc-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * Drop patch fix-version-number.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 27 May 2022 22:22:34 -0000
+
 freehep-vectorgraphics (2.4+dfsg-3) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/patches/PrintWriter-private-to-protected.patch b/debian/patches/PrintWriter-private-to-protected.patch
index ebf29d8..611809f 100644
--- a/debian/patches/PrintWriter-private-to-protected.patch
+++ b/debian/patches/PrintWriter-private-to-protected.patch
@@ -1,10 +1,10 @@
 Description: Making field required by GeoGebra protected instead of private.
 Author: Giovanni Mascellani <gio@debian.org>
-diff --git a/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java b/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
-index 27fcb1d..84004cc 100644
---- a/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
-+++ b/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
-@@ -155,7 +155,7 @@ public class SVGGraphics2D extends AbstractVectorGraphicsIO {
+Index: freehep-vectorgraphics/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
+===================================================================
+--- freehep-vectorgraphics.orig/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
++++ freehep-vectorgraphics/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
+@@ -155,7 +155,7 @@ public class SVGGraphics2D extends Abstr
      // The private writer used for this file.
      private OutputStream ros;
  
diff --git a/debian/patches/fix-version-number.patch b/debian/patches/fix-version-number.patch
deleted file mode 100644
index b69b6c3..0000000
--- a/debian/patches/fix-version-number.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/freehep-graphics2d-export-example/pom.xml
-+++ b/freehep-graphics2d-export-example/pom.xml
-@@ -3,7 +3,7 @@
- 	<parent>
- 		<artifactId>freehep-vectorgraphics</artifactId>
- 		<groupId>org.freehep</groupId>
--		<version>2.3.1-SNAPSHOT</version>
-+		<version>2.4</version>
- 	</parent>
- 
- 	<modelVersion>4.0.0</modelVersion>
---- a/freehep-graphics2d-headless-example/pom.xml
-+++ b/freehep-graphics2d-headless-example/pom.xml
-@@ -3,7 +3,7 @@
- 	<parent>
- 		<artifactId>freehep-vectorgraphics</artifactId>
- 		<groupId>org.freehep</groupId>
--		<version>2.3.1-SNAPSHOT</version>
-+		<version>2.4</version>
- 	</parent>
- 
- 	<modelVersion>4.0.0</modelVersion>
---- a/freehep-graphics2d/pom.xml
-+++ b/freehep-graphics2d/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsbase/pom.xml
-+++ b/freehep-graphicsbase/pom.xml
-@@ -2,7 +2,7 @@
- 	<parent>
- 		<artifactId>freehep-vectorgraphics</artifactId>
- 		<groupId>org.freehep</groupId>
--		<version>2.3.1-SNAPSHOT</version>
-+		<version>2.4</version>
- 	</parent>
- 	<modelVersion>4.0.0</modelVersion>
- 	<artifactId>freehep-graphicsbase</artifactId>
---- a/freehep-graphicsio-emf/pom.xml
-+++ b/freehep-graphicsio-emf/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-java/pom.xml
-+++ b/freehep-graphicsio-java/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-pdf/pom.xml
-+++ b/freehep-graphicsio-pdf/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio/pom.xml
-+++ b/freehep-graphicsio/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-ps/pom.xml
-+++ b/freehep-graphicsio-ps/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-svg/pom.xml
-+++ b/freehep-graphicsio-svg/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-swf/pom.xml
-+++ b/freehep-graphicsio-swf/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/freehep-graphicsio-tests/pom.xml
-+++ b/freehep-graphicsio-tests/pom.xml
-@@ -3,7 +3,7 @@
-   <parent>
-     <artifactId>freehep-vectorgraphics</artifactId>
-     <groupId>org.freehep</groupId>
--    <version>2.3.1-SNAPSHOT</version>
-+    <version>2.4</version>
-   </parent>
- 
-   <modelVersion>4.0.0</modelVersion>
---- a/pom.xml
-+++ b/pom.xml
-@@ -4,7 +4,7 @@
- 
- 	<groupId>org.freehep</groupId>
- 	<artifactId>freehep-vectorgraphics</artifactId>
--	<version>2.3.1-SNAPSHOT</version>
-+	<version>2.4</version>
- 	<packaging>pom</packaging>
- 
- 	<name>FreeHEP Vector Graphics</name>
diff --git a/debian/patches/remove-TestCustomStrokes.patch b/debian/patches/remove-TestCustomStrokes.patch
index af000c7..5712fb8 100644
--- a/debian/patches/remove-TestCustomStrokes.patch
+++ b/debian/patches/remove-TestCustomStrokes.patch
@@ -1,6 +1,8 @@
---- a/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-+++ b/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
-@@ -18,7 +18,7 @@
+Index: freehep-vectorgraphics/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+===================================================================
+--- freehep-vectorgraphics.orig/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
++++ freehep-vectorgraphics/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestApplication.java
+@@ -18,7 +18,7 @@ public class TestApplication {
          frame.addPanel("All", new TestAll(null));
          frame.addPanel("Clip", new TestClip(null));
          frame.addPanel("Colors", new TestColors(null));
@@ -9,9 +11,11 @@
          frame.addPanel("FontDerivation", new TestFontDerivation(null));
          frame.addPanel("Fonts", new TestFonts(null));
  //        frame.addPanel("Histogram", new TestHistogram(null));
---- a/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-+++ b/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
-@@ -245,7 +245,7 @@
+Index: freehep-vectorgraphics/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+===================================================================
+--- freehep-vectorgraphics.orig/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
++++ freehep-vectorgraphics/freehep-graphicsio-tests/src/main/java/org/freehep/graphicsio/test/TestSuite.java
+@@ -245,7 +245,7 @@ public class TestSuite extends junit.fra
          tests.add(new Test("TestAll", on));
          tests.add(new Test("TestClip", on));
          tests.add(new Test("TestColors", on));
diff --git a/debian/patches/series b/debian/patches/series
index 8809279..e265b6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix-version-number.patch
 remove-TestCustomStrokes.patch
 PrintWriter-private-to-protected.patch
diff --git a/freehep-graphics2d-export-example/pom.xml b/freehep-graphics2d-export-example/pom.xml
index f387861..f65842b 100644
--- a/freehep-graphics2d-export-example/pom.xml
+++ b/freehep-graphics2d-export-example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>freehep-vectorgraphics</artifactId>
 		<groupId>org.freehep</groupId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.4</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphics2d-headless-example/pom.xml b/freehep-graphics2d-headless-example/pom.xml
index 0879bcf..a3b59d1 100644
--- a/freehep-graphics2d-headless-example/pom.xml
+++ b/freehep-graphics2d-headless-example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>freehep-vectorgraphics</artifactId>
 		<groupId>org.freehep</groupId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.4</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphics2d/pom.xml b/freehep-graphics2d/pom.xml
index a4e90b5..ac1620c 100644
--- a/freehep-graphics2d/pom.xml
+++ b/freehep-graphics2d/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsbase/pom.xml b/freehep-graphicsbase/pom.xml
index f5b30fc..d366fab 100644
--- a/freehep-graphicsbase/pom.xml
+++ b/freehep-graphicsbase/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>freehep-vectorgraphics</artifactId>
 		<groupId>org.freehep</groupId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>freehep-graphicsbase</artifactId>
diff --git a/freehep-graphicsio-emf/pom.xml b/freehep-graphicsio-emf/pom.xml
index a2850e1..98a952e 100644
--- a/freehep-graphicsio-emf/pom.xml
+++ b/freehep-graphicsio-emf/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-java/pom.xml b/freehep-graphicsio-java/pom.xml
index 9d55c33..1e69ce1 100644
--- a/freehep-graphicsio-java/pom.xml
+++ b/freehep-graphicsio-java/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-pdf/pom.xml b/freehep-graphicsio-pdf/pom.xml
index 12e3f0c..99add51 100644
--- a/freehep-graphicsio-pdf/pom.xml
+++ b/freehep-graphicsio-pdf/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-ps/pom.xml b/freehep-graphicsio-ps/pom.xml
index 5413ae9..bc2b0e1 100644
--- a/freehep-graphicsio-ps/pom.xml
+++ b/freehep-graphicsio-ps/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-svg/pom.xml b/freehep-graphicsio-svg/pom.xml
index 22f598c..5856c74 100644
--- a/freehep-graphicsio-svg/pom.xml
+++ b/freehep-graphicsio-svg/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-swf/pom.xml b/freehep-graphicsio-swf/pom.xml
index 37ee145..c53d9ad 100644
--- a/freehep-graphicsio-swf/pom.xml
+++ b/freehep-graphicsio-swf/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio-tests/pom.xml b/freehep-graphicsio-tests/pom.xml
index 02a8e12..8dd708f 100644
--- a/freehep-graphicsio-tests/pom.xml
+++ b/freehep-graphicsio-tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/freehep-graphicsio/pom.xml b/freehep-graphicsio/pom.xml
index 3d25c85..ca10a7c 100644
--- a/freehep-graphicsio/pom.xml
+++ b/freehep-graphicsio/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>freehep-vectorgraphics</artifactId>
     <groupId>org.freehep</groupId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index e446750..5741cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.freehep</groupId>
 	<artifactId>freehep-vectorgraphics</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.4</version>
 	<packaging>pom</packaging>
 
 	<name>FreeHEP Vector Graphics</name>
@@ -47,7 +47,7 @@
 		<connection>scm:git:git://github.com/freehep/freehep-vectorgraphics.git</connection>
 		<developerConnection>scm:git:git@github.com:freehep/freehep-vectorgraphics.git</developerConnection>
 		<url>http://github.com/freehep/freehep-vectorgraphics</url>
-		<tag>HEAD</tag>
+		<tag>freehep-vectorgraphics-2.4</tag>
 	</scm>
 
 	<issueManagement>
@@ -171,7 +171,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.4.2</version>
+				<version>2.5</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<preparationGoals>clean install</preparationGoals>
@@ -183,14 +183,14 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.3</version>
+				<version>3.4</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
+				<version>2.4.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -210,7 +210,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
+				<version>2.17</version>
 				<!-- <configuration> <forkMode>pertest</forkMode> <includes> <include>**/*TestSuite.java</include> 
 					</includes> <excludes> <exclude>**/TestSuite.java</exclude> </excludes> </configuration> -->
 			</plugin>
@@ -272,7 +272,7 @@
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-scm-publish-plugin</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <configuration>
         <checkoutDirectory>${project.build.directory}/scmpublish</checkoutDirectory>
         <checkinComment>Publishing javadoc for ${project.artifactId}:${project.version}</checkinComment>
@@ -379,7 +379,7 @@
 						<inherited>true</inherited>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>2.2.1</version>
+						<version>2.3</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@@ -407,7 +407,7 @@
 						<inherited>true</inherited>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>2.8.1</version>
+						<version>2.8.2</version>
 						<configuration>
 							<updateReleaseInfo>true</updateReleaseInfo>
 						</configuration>