diff --git a/java/bundles/org.eclipse.set.feature.export/.classpath b/java/bundles/org.eclipse.set.feature.export/.classpath
index 2605d96cf9..496bcdce7d 100644
--- a/java/bundles/org.eclipse.set.feature.export/.classpath
+++ b/java/bundles/org.eclipse.set.feature.export/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="hyph/"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF b/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF
index f67371249e..2a284f08e9 100644
--- a/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF
+++ b/java/bundles/org.eclipse.set.feature.export/META-INF/MANIFEST.MF
@@ -110,6 +110,8 @@ Import-Package: jakarta.annotation,
  org.osgi.service.event,
  org.slf4j;version="1.7.2"
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: hyph/,
+ .
 Service-Component: OSGI-INF/org.eclipse.set.feature.export.descriptions.SiteplanModelExportDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.export.descriptions.TitleBoxPdfDescriptionService.xml,
  OSGI-INF/org.eclipse.set.feature.export.exportservice.ExportServiceImpl.xml,
diff --git a/java/bundles/org.eclipse.set.feature.export/build.properties b/java/bundles/org.eclipse.set.feature.export/build.properties
index afefcb6fd6..c57c710418 100644
--- a/java/bundles/org.eclipse.set.feature.export/build.properties
+++ b/java/bundles/org.eclipse.set.feature.export/build.properties
@@ -3,6 +3,7 @@ bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
                fop.e4xmi,\
-               plugin.xml
+               plugin.xml,\
+               hyph/
 source.. = src/,\
            xtend-gen/
diff --git a/java/bundles/org.eclipse.set.feature.export/hyph/de.hyp b/java/bundles/org.eclipse.set.feature.export/hyph/de.hyp
new file mode 100644
index 0000000000..5deefad0a0
Binary files /dev/null and b/java/bundles/org.eclipse.set.feature.export/hyph/de.hyp differ
diff --git a/java/bundles/org.eclipse.set.feature.export/hyph/de_1901.hyp b/java/bundles/org.eclipse.set.feature.export/hyph/de_1901.hyp
new file mode 100644
index 0000000000..91ad118d75
Binary files /dev/null and b/java/bundles/org.eclipse.set.feature.export/hyph/de_1901.hyp differ
diff --git a/java/bundles/org.eclipse.set.feature.export/hyph/de_CH.hyp b/java/bundles/org.eclipse.set.feature.export/hyph/de_CH.hyp
new file mode 100644
index 0000000000..159ff8eef1
Binary files /dev/null and b/java/bundles/org.eclipse.set.feature.export/hyph/de_CH.hyp differ
diff --git a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/fop/FopServiceImpl.java b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/fop/FopServiceImpl.java
index 5c7c5af917..c8b3279200 100644
--- a/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/fop/FopServiceImpl.java
+++ b/java/bundles/org.eclipse.set.feature.export/src/org/eclipse/set/feature/export/fop/FopServiceImpl.java
@@ -14,6 +14,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Map;
 
@@ -27,6 +28,7 @@
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.FopFactoryBuilder;
+import org.apache.fop.apps.io.ResourceResolverFactory;
 import org.apache.fop.configuration.ConfigurationException;
 import org.apache.xmlgraphics.io.Resource;
 import org.apache.xmlgraphics.io.ResourceResolver;
@@ -99,12 +101,18 @@ public OutputStream getOutputStream(final URI uri) throws IOException {
 	 *             a configuration exception occurred
 	 * @throws SAXException
 	 *             a SAX exception occurred
+	 * @throws URISyntaxException
 	 */
 	@Activate
-	public void activate()
-			throws IOException, SAXException, ConfigurationException {
+	public void activate() throws IOException, SAXException,
+			ConfigurationException, URISyntaxException {
 		final FopFactoryBuilder fopFactoryBuilder = new FopFactoryBuilder(
 				new File(".").toURI(), proxyResourceResolver); //$NON-NLS-1$
+		fopFactoryBuilder.setHyphenBaseResourceResolver(
+				ResourceResolverFactory.createDefaultInternalResourceResolver(
+						FopServiceImpl.class.getClassLoader()
+								.getResource("hyph") //$NON-NLS-1$
+								.toURI()));
 		fopFactory = fopFactoryBuilder.build();
 		fopFactory.getRendererFactory()
 				.addDocumentHandlerMaker(
diff --git a/java/bundles/org.eclipse.set.feature/feature.xml b/java/bundles/org.eclipse.set.feature/feature.xml
index c1194869bd..842c105d82 100644
--- a/java/bundles/org.eclipse.set.feature/feature.xml
+++ b/java/bundles/org.eclipse.set.feature/feature.xml
@@ -1422,10 +1422,6 @@ http://www.eclipse.org/legal/epl-v20.html
          id="org.apache.commons.commons-logging"
          version="0.0.0"/>
 
-   <plugin
-         id="maven.net.sf.offo.artifact.fop-hyph"
-         version="0.0.0"/>
-
    <plugin
          id="org.apache.commons.commons-collections4"
          version="0.0.0"/>
diff --git a/java/bundles/org.eclipse.set.releng.set.product/set.product b/java/bundles/org.eclipse.set.releng.set.product/set.product
index d0df6072a3..3a6a715188 100644
--- a/java/bundles/org.eclipse.set.releng.set.product/set.product
+++ b/java/bundles/org.eclipse.set.releng.set.product/set.product
@@ -24,6 +24,7 @@
 
    <windowImages/>
 
+
    <launcher name="set">
       <win useIco="true">
          <bmp/>
@@ -52,7 +53,6 @@
 
    <configurations>
       <plugin id="ch.qos.logback.classic" autoStart="true" startLevel="2" />
-      <plugin id="maven.net.sf.offo.artifact.fop-hyph" autoStart="true" startLevel="4" />
       <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
       <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="1" />
diff --git a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
index 03b826de1e..a9f4409bb6 100644
--- a/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
+++ b/java/bundles/org.eclipse.set.releng.target/org.eclipse.set.releng.target.target
@@ -227,12 +227,6 @@
 		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache FOP" missingManifest="generate" type="Maven">
 			<dependencies>
-				<dependency>
-					<groupId>net.sf.offo</groupId>
-					<artifactId>fop-hyph</artifactId>
-					<version>2.0</version>
-					<type>jar</type>
-				</dependency>
 				<dependency>
 					<groupId>org.apache.xmlgraphics</groupId>
 					<artifactId>fop</artifactId>