diff --git a/hapi-base/pom.xml b/hapi-base/pom.xml
index cee11d3b5..96a1e6ecf 100644
--- a/hapi-base/pom.xml
+++ b/hapi-base/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/hapi-bom/pom.xml b/hapi-bom/pom.xml
index 47b6be5bd..63a1b0a35 100644
--- a/hapi-bom/pom.xml
+++ b/hapi-bom/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>hapi</artifactId>
         <groupId>ca.uhn.hapi</groupId>
-        <version>2.5</version>
+        <version>2.5.1</version>
    </parent>
     
     <dependencyManagement>
diff --git a/hapi-dist/pom.xml b/hapi-dist/pom.xml
index e4889b5c6..5d0e34b59 100644
--- a/hapi-dist/pom.xml
+++ b/hapi-dist/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-examples/pom.xml b/hapi-examples/pom.xml
index 2ff1a2c1b..97d4e6857 100644
--- a/hapi-examples/pom.xml
+++ b/hapi-examples/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-hl7overhttp/pom.xml b/hapi-hl7overhttp/pom.xml
index 096668b0f..fa6da1710 100644
--- a/hapi-hl7overhttp/pom.xml
+++ b/hapi-hl7overhttp/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/hapi-osgi-base/pom.xml b/hapi-osgi-base/pom.xml
index 7cab67034..286a07bf8 100644
--- a/hapi-osgi-base/pom.xml
+++ b/hapi-osgi-base/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-sourcegen/pom.xml b/hapi-sourcegen/pom.xml
index 941c19b20..b4c645718 100644
--- a/hapi-sourcegen/pom.xml
+++ b/hapi-sourcegen/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-superstructures/pom.xml b/hapi-structures-superstructures/pom.xml
index 4a1df5122..75cad1ba2 100644
--- a/hapi-structures-superstructures/pom.xml
+++ b/hapi-structures-superstructures/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v21/pom.xml b/hapi-structures-v21/pom.xml
index 4062a4757..6fce680cc 100644
--- a/hapi-structures-v21/pom.xml
+++ b/hapi-structures-v21/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v22/pom.xml b/hapi-structures-v22/pom.xml
index c1bed8dc7..b98e10e6d 100644
--- a/hapi-structures-v22/pom.xml
+++ b/hapi-structures-v22/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v23/pom.xml b/hapi-structures-v23/pom.xml
index de4e4699e..bd0967748 100644
--- a/hapi-structures-v23/pom.xml
+++ b/hapi-structures-v23/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v231-alternatenames/pom.xml b/hapi-structures-v231-alternatenames/pom.xml
index f3a40b482..d37184e81 100644
--- a/hapi-structures-v231-alternatenames/pom.xml
+++ b/hapi-structures-v231-alternatenames/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v231/pom.xml b/hapi-structures-v231/pom.xml
index b03150a35..ba500ae79 100644
--- a/hapi-structures-v231/pom.xml
+++ b/hapi-structures-v231/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v24/pom.xml b/hapi-structures-v24/pom.xml
index 59d0266d0..7cce799ee 100644
--- a/hapi-structures-v24/pom.xml
+++ b/hapi-structures-v24/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v25/pom.xml b/hapi-structures-v25/pom.xml
index 1787c39d2..3e695851d 100644
--- a/hapi-structures-v25/pom.xml
+++ b/hapi-structures-v25/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v251/pom.xml b/hapi-structures-v251/pom.xml
index b91df76e4..917f5be0d 100644
--- a/hapi-structures-v251/pom.xml
+++ b/hapi-structures-v251/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v26/pom.xml b/hapi-structures-v26/pom.xml
index 2030c97ac..03e18a036 100644
--- a/hapi-structures-v26/pom.xml
+++ b/hapi-structures-v26/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v27/pom.xml b/hapi-structures-v27/pom.xml
index df5d7d2bd..2988c441f 100644
--- a/hapi-structures-v27/pom.xml
+++ b/hapi-structures-v27/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v28/pom.xml b/hapi-structures-v28/pom.xml
index 89e95fde6..f8c467192 100644
--- a/hapi-structures-v28/pom.xml
+++ b/hapi-structures-v28/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-structures-v281/pom.xml b/hapi-structures-v281/pom.xml
index f032f4243..d7162fc8a 100644
--- a/hapi-structures-v281/pom.xml
+++ b/hapi-structures-v281/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/hapi-test/pom.xml b/hapi-test/pom.xml
index a6776499e..5cc91f351 100644
--- a/hapi-test/pom.xml
+++ b/hapi-test/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-testmindeps/pom.xml b/hapi-testmindeps/pom.xml
index 5ca92b738..5f030af70 100644
--- a/hapi-testmindeps/pom.xml
+++ b/hapi-testmindeps/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-testnodeps/pom.xml b/hapi-testnodeps/pom.xml
index 11109541b..f5174d9fe 100644
--- a/hapi-testnodeps/pom.xml
+++ b/hapi-testnodeps/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/hapi-testpanel/pom.xml b/hapi-testpanel/pom.xml
index 0318dfaf9..0863e43b8 100644
--- a/hapi-testpanel/pom.xml
+++ b/hapi-testpanel/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>hapi</artifactId>
 		<groupId>ca.uhn.hapi</groupId>
-		<version>2.5</version>
+		<version>2.5.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 80bfd25d5..e51b1d533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>ca.uhn.hapi</groupId>
 	<artifactId>hapi</artifactId>
 	<packaging>pom</packaging>
-	<version>2.5</version>
+	<version>2.5.1</version>
 	<name>HAPI - The Open Source Java HL7 Parser and API</name>
 	<url>http://hl7api.sourceforge.net/</url>
 	<description>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bbb754c4a..68b619cb3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -5,6 +5,13 @@
 		<title>HAPI</title>
 	</properties>
 	<body>
+		<release version="2.5.1" date="2023-11-01">
+			<action type="fix" dev="Emre Dincturk">
+				SimpleServer now waits for its server socket to be closed when stopAndWait is called.
+				This makes it easier for consumers of SimpleServer to reuse the port after stopping the server
+				without implementing a wait for the port to be released themselves.
+			</action>
+		</release>
 		<release version="2.4.1" date="2023-11-01">
 			<action type="fix" dev="Emre Dincturk">
 				SimpleServer now waits for its server socket to be closed when stopAndWait is called.
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 13959afdc..a78f450ca 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -10,9 +10,6 @@
 
 		<!-- The body of the document contains a number of sections -->
 		<section name="Welcome">
-			<p>
-			    SOCIALPLUGINSHEREAPI
-			</p>
 			<p>
 				This is the home page for the HAPI project.
 				HAPI (HL7 application
@@ -89,6 +86,13 @@
 
 		</section>
 
+		<section name="HAPI HL7v2 2.4.1 and 2.5.1 Released - Nov 1, 2023">
+			<p>
+				A last minute bug found in HAPI FHIR 2.4 and 2.5 was discovered and fixed, so
+				two new releases have been produced.
+			</p>
+		</section>
+
 		<section name="HAPI HL7v2 2.4 and 2.5 Released - Oct 30, 2023">
 
 			<p>