diff --git a/jabgui/build.gradle.kts b/jabgui/build.gradle.kts
index 1066e1dd851..9363d779a2e 100644
--- a/jabgui/build.gradle.kts
+++ b/jabgui/build.gradle.kts
@@ -23,6 +23,8 @@ dependencies {
     implementation("org.openjfx:javafx-swing")
     implementation("org.openjfx:javafx-web")
 
+    implementation(project(":jabsrv"))
+
     implementation("com.pixelduke:fxthemes")
 
     // From JavaFX25 onwards
diff --git a/jabgui/src/main/java/module-info.java b/jabgui/src/main/java/module-info.java
index 552f3404317..7d19bbd6f66 100644
--- a/jabgui/src/main/java/module-info.java
+++ b/jabgui/src/main/java/module-info.java
@@ -1,6 +1,8 @@
 open module org.jabref {
     requires org.jabref.jablib;
 
+    requires org.jabref.jabsrv;
+
     // Swing
     requires java.desktop;
 
diff --git a/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java b/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
index 761fd2b0473..2535d372d00 100644
--- a/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -28,6 +28,7 @@
 import org.jabref.gui.util.DirectoryMonitor;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.gui.util.WebViewStore;
+import org.jabref.http.manager.HttpServerManager;
 import org.jabref.logic.UiCommand;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.citation.SearchCitationsRelationsService;
@@ -80,6 +81,7 @@ public class JabRefGUI extends Application {
     private static JabRefFrame mainFrame;
 
     private static RemoteListenerServerManager remoteListenerServerManager;
+    private static HttpServerManager httpServerManager;
 
     private Stage mainStage;
 
@@ -157,7 +159,10 @@ public void initialize() {
         IndexManager.clearOldSearchIndices();
 
         JabRefGUI.remoteListenerServerManager = new RemoteListenerServerManager();
-        Injector.setModelOrService(RemoteListenerServerManager.class, remoteListenerServerManager);
+        Injector.setModelOrService(RemoteListenerServerManager.class, JabRefGUI.remoteListenerServerManager);
+
+        JabRefGUI.httpServerManager = new HttpServerManager();
+        Injector.setModelOrService(HttpServerManager.class, JabRefGUI.httpServerManager);
 
         JabRefGUI.stateManager = new StateManager();
         Injector.setModelOrService(StateManager.class, stateManager);
@@ -396,6 +401,7 @@ private boolean upperRightIsInBounds(CoreGuiPreferences coreGuiPreferences) {
     // Background tasks
     public void startBackgroundTasks() {
         RemotePreferences remotePreferences = preferences.getRemotePreferences();
+
         if (remotePreferences.useRemoteServer()) {
             remoteListenerServerManager.openAndStart(
                     new CLIMessageHandler(
@@ -403,6 +409,10 @@ public void startBackgroundTasks() {
                             preferences),
                     remotePreferences.getPort());
         }
+
+        if (remotePreferences.enableHttpServer()) {
+            httpServerManager.start(stateManager.getOpenDatabases(), remotePreferences.getHttpServerUri());
+        }
     }
 
     @Override
@@ -413,14 +423,25 @@ public void stop() {
         } catch (Exception e) {
             LOGGER.error("Unable to close AI service", e);
         }
+
         LOGGER.trace("Closing OpenOffice connection");
         OOBibBaseConnect.closeOfficeConnection();
+
+        LOGGER.trace("Shutting down remote server manager");
+        remoteListenerServerManager.stop();
+
+        LOGGER.trace("Shutting down http server manager");
+        httpServerManager.stop();
+
         LOGGER.trace("Stopping background tasks");
         stopBackgroundTasks();
+
         LOGGER.trace("Shutting down thread pools");
         shutdownThreadPools();
+
         LOGGER.trace("Closing citations and relations search service");
         citationsAndRelationsSearchService.close();
+
         LOGGER.trace("Finished stop");
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 9f8f0003c70..c041d866707 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -57,6 +57,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private TextField backupDirectory;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
+    @FXML private CheckBox enableHttpServer;
     @FXML private Button remoteHelp;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
     @Inject private BibEntryTypesManager entryTypesManager;
@@ -149,6 +150,8 @@ public void initialize() {
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
+
+        enableHttpServer.selectedProperty().bindBidirectional(viewModel.enableHttpServerProperty());
     }
 
     @FXML
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index 087cbed3b0a..9a2a6483ac6 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.preferences.general;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,9 +18,11 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.frame.UiMessageHandler;
@@ -30,6 +33,7 @@
 import org.jabref.gui.theme.ThemeTypes;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.http.manager.HttpServerManager;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.l10n.Language;
@@ -39,6 +43,7 @@
 import org.jabref.logic.remote.RemoteUtil;
 import org.jabref.logic.remote.server.RemoteListenerServerManager;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -49,12 +54,16 @@
 import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GeneralTabViewModel implements PreferenceTabViewModel {
 
     protected static SpinnerValueFactory<Integer> fontSizeValueFactory =
             new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(GeneralTabViewModel.class);
+
     private final ReadOnlyListProperty<Language> languagesListProperty =
             new ReadOnlyListWrapper<>(FXCollections.observableArrayList(Language.getSorted()));
     private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
@@ -101,9 +110,11 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final Validator remotePortValidator;
-    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BooleanProperty enableHttpServerProperty = new SimpleBooleanProperty();
     private final TrustStoreManager trustStoreManager;
 
+    private final FileUpdateMonitor fileUpdateMonitor;
+
     public GeneralTabViewModel(DialogService dialogService, GuiPreferences preferences, FileUpdateMonitor fileUpdateMonitor) {
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -197,6 +208,8 @@ public void setValues() {
 
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+
+        enableHttpServerProperty.setValue(remotePreferences.enableHttpServer());
     }
 
     @Override
@@ -251,8 +264,8 @@ public void storeSettings() {
 
         UiMessageHandler uiMessageHandler = Injector.instantiateModelOrService(UiMessageHandler.class);
         RemoteListenerServerManager remoteListenerServerManager = Injector.instantiateModelOrService(RemoteListenerServerManager.class);
-        remoteListenerServerManager.stop(); // stop in all cases, because the port might have changed
-
+        // stop in all cases, because the port might have changed
+        remoteListenerServerManager.stop();
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
             remoteListenerServerManager.openAndStart(
@@ -260,18 +273,22 @@ public void storeSettings() {
                     remotePreferences.getPort());
         } else {
             remotePreferences.setUseRemoteServer(false);
+            remoteListenerServerManager.stop();
         }
-        trustStoreManager.flush();
 
-        if (remoteServerProperty.getValue()) {
-            remotePreferences.setUseRemoteServer(true);
-            remoteListenerServerManager.openAndStart(
-                    new CLIMessageHandler(uiMessageHandler, preferences),
-                    remotePreferences.getPort());
+        HttpServerManager httpServerManager = Injector.instantiateModelOrService(HttpServerManager.class);
+        // stop in all cases, because the port might have changed
+        httpServerManager.stop();
+        if (enableHttpServerProperty.getValue()) {
+            remotePreferences.setEnableHttpServer(true);
+            ObservableList<BibDatabaseContext> openDatabases = Injector.instantiateModelOrService(StateManager.class).getOpenDatabases();
+            URI uri = remotePreferences.getHttpServerUri();
+            httpServerManager.start(openDatabases, uri);
         } else {
-            remotePreferences.setUseRemoteServer(false);
-            remoteListenerServerManager.stop();
+            remotePreferences.setEnableHttpServer(false);
+            httpServerManager.stop();
         }
+
         trustStoreManager.flush();
     }
 
@@ -421,6 +438,10 @@ public StringProperty remotePortProperty() {
         return remotePortProperty;
     }
 
+    public BooleanProperty enableHttpServerProperty() {
+        return enableHttpServerProperty;
+    }
+
     public void openBrowser() {
         String url = "https://themes.jabref.org";
         try {
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
index 924cd2a7504..9f88b842a99 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -82,6 +82,9 @@
         <Button fx:id="remoteHelp" prefWidth="20.0" />
     </HBox>
 
+    <Label styleClass="sectionHeader" text="%HTTP Server" />
+    <CheckBox fx:id="enableHttpServer" text="%Enable HTTP Server (e.g., for JabMap)" />
+
     <Label styleClass="sectionHeader" text="%Libraries"/>
     <GridPane hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 9e4cb036172..099c58e6960 100644
--- a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -365,6 +365,7 @@ public class JabRefCliPreferences implements CliPreferences {
     // Remote
     private static final String USE_REMOTE_SERVER = "useRemoteServer";
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
+    private static final String ENABLE_HTTP_SERVER = "enableHttpServer";
 
     private static final String AI_ENABLED = "aiEnabled";
     private static final String AI_AUTO_GENERATE_EMBEDDINGS = "aiAutoGenerateEmbeddings";
@@ -637,6 +638,7 @@ public JabRefCliPreferences() {
 
         defaults.put(USE_REMOTE_SERVER, Boolean.TRUE);
         defaults.put(REMOTE_SERVER_PORT, 6050);
+        defaults.put(ENABLE_HTTP_SERVER, Boolean.FALSE);
 
         defaults.put(EXTERNAL_JOURNAL_LISTS, "");
         defaults.put(USE_AMS_FJOURNAL, true);
@@ -1247,10 +1249,12 @@ public RemotePreferences getRemotePreferences() {
 
         remotePreferences = new RemotePreferences(
                 getInt(REMOTE_SERVER_PORT),
-                getBoolean(USE_REMOTE_SERVER));
+                getBoolean(USE_REMOTE_SERVER),
+                getBoolean(ENABLE_HTTP_SERVER));
 
         EasyBind.listen(remotePreferences.portProperty(), (_, _, newValue) -> putInt(REMOTE_SERVER_PORT, newValue));
         EasyBind.listen(remotePreferences.useRemoteServerProperty(), (_, _, newValue) -> putBoolean(USE_REMOTE_SERVER, newValue));
+        EasyBind.listen(remotePreferences.enableHttpServerProperty(), (_, _, newValue) -> putBoolean(ENABLE_HTTP_SERVER, newValue));
 
         return remotePreferences;
     }
diff --git a/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java b/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
index 5d06d28261b..79f37d38a41 100644
--- a/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.remote;
 
 import java.net.InetAddress;
+import java.net.URI;
 import java.net.UnknownHostException;
 
 import javafx.beans.property.BooleanProperty;
@@ -8,17 +9,25 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Place for handling the preferences for the remote communication
  */
 public class RemotePreferences {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemotePreferences.class);
+
     private final IntegerProperty port;
     private final BooleanProperty useRemoteServer;
 
-    public RemotePreferences(int port, boolean useRemoteServer) {
+    private final BooleanProperty enableHttpServer;
+
+    public RemotePreferences(int port, boolean useRemoteServer, boolean enableHttpServer) {
         this.port = new SimpleIntegerProperty(port);
         this.useRemoteServer = new SimpleBooleanProperty(useRemoteServer);
+        this.enableHttpServer = new SimpleBooleanProperty(enableHttpServer);
     }
 
     public int getPort() {
@@ -33,6 +42,10 @@ public void setPort(int port) {
         this.port.setValue(port);
     }
 
+    public boolean isDifferentPort(int otherPort) {
+        return getPort() != otherPort;
+    }
+
     public boolean useRemoteServer() {
         return useRemoteServer.getValue();
     }
@@ -45,14 +58,29 @@ public void setUseRemoteServer(boolean useRemoteServer) {
         this.useRemoteServer.setValue(useRemoteServer);
     }
 
-    public boolean isDifferentPort(int otherPort) {
-        return getPort() != otherPort;
+    public boolean enableHttpServer() {
+        return enableHttpServer.getValue();
+    }
+
+    public BooleanProperty enableHttpServerProperty() {
+        return enableHttpServer;
     }
 
-    /**
-     * Gets the IP address where the remote server is listening.
-     */
+    public void setEnableHttpServer(boolean enableHttpServer) {
+        this.enableHttpServer.setValue(enableHttpServer);
+    }
+
+    /// Gets the IP address where both the remote server and the http server are listening.
     public static InetAddress getIpAddress() throws UnknownHostException {
         return InetAddress.getByName("localhost");
     }
+
+    public URI getHttpServerUri() {
+        try {
+            return URI.create("http://" + RemotePreferences.getIpAddress().getHostAddress() + ":23119");
+        } catch (UnknownHostException e) {
+            LOGGER.error("Could not create HTTP server URI. Falling back to default.", e);
+            return URI.create("http://localhost:23119");
+        }
+    }
 }
diff --git a/jablib/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java b/jablib/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
index a7ec5d15075..735d900bfe6 100644
--- a/jablib/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
+++ b/jablib/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
@@ -3,12 +3,10 @@
 import java.io.IOException;
 import java.net.BindException;
 
-import org.jabref.logic.util.HeadlessExecutorService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/// Manages the TeleServerThread through typical life cycle methods.
+/// Manages the RemoteServerThread through typical life cycle methods.
 ///
 /// open -> start -> stop
 /// openAndStart -> stop
@@ -21,10 +19,13 @@ public class RemoteListenerServerManager implements AutoCloseable {
     private RemoteListenerServerThread remoteServerThread;
 
     public void stop() {
+        LOGGER.debug("Stopping RemoteListenerServerManager");
         if (isOpen()) {
             remoteServerThread.interrupt();
             remoteServerThread = null;
-            HeadlessExecutorService.INSTANCE.stopRemoteThread();
+            LOGGER.debug("RemoteListenerServerManager stopped successfully.");
+        } else {
+            LOGGER.debug("RemoteListenerServerManager was not open, nothing to stop.");
         }
     }
 
@@ -55,7 +56,7 @@ public boolean isOpen() {
     public void start() {
         if (isOpen() && isNotStartedBefore()) {
             // threads can only be started when in state NEW
-            HeadlessExecutorService.INSTANCE.startRemoteThread(remoteServerThread);
+            remoteServerThread.start();
         }
     }
 
@@ -71,6 +72,7 @@ public void openAndStart(RemoteMessageHandler messageHandler, int port) {
 
     @Override
     public void close() {
+        LOGGER.debug("Closing RemoteListenerServerManager");
         stop();
     }
 }
diff --git a/jablib/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java b/jablib/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
index c4b50912cf1..98fbe80f8cb 100644
--- a/jablib/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
+++ b/jablib/src/main/java/org/jabref/logic/util/HeadlessExecutorService.java
@@ -45,8 +45,6 @@ public class HeadlessExecutorService implements Executor {
 
     private final Timer timer = new Timer("timer", true);
 
-    private Thread remoteThread;
-
     private HeadlessExecutorService() {
    }
 
@@ -121,22 +119,6 @@ public void executeInterruptableTaskAndWait(Runnable runnable) {
         }
     }
 
-    public void startRemoteThread(Thread thread) {
-        if (this.remoteThread != null) {
-            throw new IllegalStateException("Tele thread is already attached");
-        } else {
-            this.remoteThread = thread;
-            remoteThread.start();
-        }
-    }
-
-    public void stopRemoteThread() {
-        if (remoteThread != null) {
-            remoteThread.interrupt();
-            remoteThread = null;
-        }
-    }
-
     public void submit(TimerTask timerTask, long millisecondsDelay) {
         timer.schedule(timerTask, millisecondsDelay);
     }
@@ -145,9 +127,6 @@ public void submit(TimerTask timerTask, long millisecondsDelay) {
      * Shuts everything down. After termination, this method returns.
      */
     public void shutdownEverything() {
-        LOGGER.trace("Stopping remote thread");
-        stopRemoteThread();
-
         LOGGER.trace("Gracefully shut down executor service");
         gracefullyShutdown(this.executorService);
 
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index a4af9f0a754..0d3f80e4f5c 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -1816,6 +1816,10 @@ Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port
 Remote\ operation=Remote operation
 Remote\ services=Remote services
 Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ using\ it.\ Try\ specifying\ another\ port.=Cannot use port %0 for remote operation; another application may be using it. Try specifying another port.
+
+Enable\ HTTP\ Server\ (e.g.,\ for\ JabMap)=Enable HTTP Server (e.g., for JabMap)
+HTTP\ Server=HTTP Server
+
 Grobid\ URL=Grobid URL
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
 Send\ to\ Grobid=Send to Grobid
diff --git a/jablib/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java b/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
similarity index 91%
rename from jablib/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java
rename to jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
index 9aab6f25425..326a8048b72 100644
--- a/jablib/src/test/java/org/jabref/logic/remote/RemoteGuiPreferencesTest.java
+++ b/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
@@ -7,13 +7,13 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-class RemoteGuiPreferencesTest {
+class RemotePreferencesTest {
 
     private RemotePreferences preferences;
 
     @BeforeEach
     void setUp() {
-        preferences = new RemotePreferences(1000, true);
+        preferences = new RemotePreferences(1000, true, false);
     }
 
     @Test
diff --git a/jabsrv-cli/src/main/java/module-info.java b/jabsrv-cli/src/main/java/module-info.java
index be05a21664d..52bc06d9406 100644
--- a/jabsrv-cli/src/main/java/module-info.java
+++ b/jabsrv-cli/src/main/java/module-info.java
@@ -16,6 +16,9 @@
     requires jakarta.inject;
 
     requires afterburner.fx;
+    provides com.airhacks.afterburner.views.ResourceLocator
+            with org.jabref.http.cli.JabRefResourceLocator;
+    requires javafx.base;
 
     requires org.glassfish.grizzly;
     requires org.glassfish.grizzly.http;
diff --git a/jabsrv/src/main/java/org/jabref/http/JabRefResourceLocator.java b/jabsrv-cli/src/main/java/org/jabref/http/cli/JabRefResourceLocator.java
similarity index 79%
rename from jabsrv/src/main/java/org/jabref/http/JabRefResourceLocator.java
rename to jabsrv-cli/src/main/java/org/jabref/http/cli/JabRefResourceLocator.java
index df4b4418779..fbbb34db43b 100644
--- a/jabsrv/src/main/java/org/jabref/http/JabRefResourceLocator.java
+++ b/jabsrv-cli/src/main/java/org/jabref/http/cli/JabRefResourceLocator.java
@@ -1,4 +1,4 @@
-package org.jabref.http;
+package org.jabref.http.cli;
 
 import java.util.ResourceBundle;
 
@@ -9,6 +9,7 @@
 import org.slf4j.LoggerFactory;
 
 // TODO: Code duplication of org.jabref.gui.util.JabRefResourceLocator - should be streamlined
+// Reason for duplication: The CLI does not depend on the GUI module, so it cannot use the GUI's JabRefResourceLocator directly.
 public class JabRefResourceLocator implements ResourceLocator {
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefResourceLocator.class);
 
diff --git a/jabsrv/src/main/java/module-info.java b/jabsrv/src/main/java/module-info.java
index 0e7d6b2a521..c03053d4136 100644
--- a/jabsrv/src/main/java/module-info.java
+++ b/jabsrv/src/main/java/module-info.java
@@ -1,5 +1,6 @@
 module org.jabref.jabsrv {
     exports org.jabref.http.server;
+    exports org.jabref.http.manager;
 
     exports org.jabref.http.dto to com.google.gson, org.glassfish.hk2.locator;
     exports org.jabref.http.dto.cayw to com.google.gson;
@@ -8,6 +9,13 @@
     exports org.jabref.http.server.cayw;
     opens org.jabref.http.server.cayw to com.google.gson, org.glassfish.hk2.locator, org.glassfish.hk2.utilities;
 
+    requires javafx.base;
+
+    // For CAYW feature
+    requires transitive javafx.graphics;
+    requires transitive javafx.controls;
+    requires afterburner.fx;
+
     // For ServiceLocatorUtilities.createAndPopulateServiceLocator()
     requires org.glassfish.hk2.locator;
     uses org.jvnet.hk2.external.generator.ServiceLocatorGeneratorImpl;
@@ -24,10 +32,6 @@
     requires jakarta.annotation;
     requires jakarta.inject;
 
-    requires afterburner.fx;
-    provides com.airhacks.afterburner.views.ResourceLocator
-            with org.jabref.http.JabRefResourceLocator;
-
     requires org.glassfish.grizzly;
     requires org.glassfish.grizzly.http;
     requires org.glassfish.grizzly.http.server;
diff --git a/jabsrv/src/main/java/org/jabref/http/manager/HttpServerManager.java b/jabsrv/src/main/java/org/jabref/http/manager/HttpServerManager.java
new file mode 100644
index 00000000000..0a93fb35705
--- /dev/null
+++ b/jabsrv/src/main/java/org/jabref/http/manager/HttpServerManager.java
@@ -0,0 +1,51 @@
+package org.jabref.http.manager;
+
+import java.net.URI;
+
+import javafx.collections.ObservableList;
+
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/// Manages the HttpServerThread through typical life cycle methods.
+///
+/// open -> start -> stop
+/// openAndStart -> stop
+///
+/// Observer: isOpen, isNotStartedBefore
+public class HttpServerManager implements AutoCloseable {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpServerManager.class);
+
+    private HttpServerThread httpServerThread;
+
+    public synchronized void start(ObservableList<BibDatabaseContext> contextsToServe, URI uri) {
+        if (!isStarted()) {
+            httpServerThread = new HttpServerThread(contextsToServe, uri);
+            httpServerThread.start();
+        }
+    }
+
+    public synchronized void stop() {
+        LOGGER.debug("Stopping HTTP server manager...");
+        if (isStarted()) {
+            httpServerThread.interrupt();
+            httpServerThread = null;
+            LOGGER.debug("HTTP server manager stopped successfully.");
+        } else {
+            LOGGER.debug("HTTP server manager is not started, nothing to stop.");
+        }
+    }
+
+    private boolean isStarted() {
+        return httpServerThread != null;
+    }
+
+    @Override
+    public void close() {
+        LOGGER.debug("Closing HTTP server manager...");
+        stop();
+    }
+}
diff --git a/jabsrv/src/main/java/org/jabref/http/manager/HttpServerThread.java b/jabsrv/src/main/java/org/jabref/http/manager/HttpServerThread.java
new file mode 100644
index 00000000000..e143d36a439
--- /dev/null
+++ b/jabsrv/src/main/java/org/jabref/http/manager/HttpServerThread.java
@@ -0,0 +1,45 @@
+package org.jabref.http.manager;
+
+import java.net.URI;
+
+import javafx.collections.ObservableList;
+
+import org.jabref.http.server.Server;
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This thread wrapper is required to be able to interrupt the http server, e.g. when JabRef is closing down the http server should shutdown as well.
+ */
+public class HttpServerThread extends Thread {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HttpServerThread.class);
+
+    private final Server server;
+    private final ObservableList<BibDatabaseContext> contextsToServe;
+    private final URI uri;
+
+    private HttpServer httpServer;
+
+    public HttpServerThread(ObservableList<BibDatabaseContext> contextsToServe, URI uri) {
+        this.contextsToServe = contextsToServe;
+        this.uri = uri;
+        this.server = new Server();
+        this.setName("JabSrv - JabRef HTTP Server on " + uri.getHost() + ":" + uri.getPort());
+    }
+
+    @Override
+    public void run() {
+        httpServer = this.server.run(contextsToServe, uri);
+    }
+
+    @Override
+    public void interrupt() {
+        LOGGER.debug("Interrupting {}", this.getName());
+        this.httpServer.shutdownNow();
+        super.interrupt();
+    }
+}
diff --git a/jabsrv/src/main/java/org/jabref/http/manager/package-info.java b/jabsrv/src/main/java/org/jabref/http/manager/package-info.java
new file mode 100644
index 00000000000..6258bb4c371
--- /dev/null
+++ b/jabsrv/src/main/java/org/jabref/http/manager/package-info.java
@@ -0,0 +1,2 @@
+/// Implemented similar to package org.jabref.logic.remote.server;
+package org.jabref.http.manager;
diff --git a/jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java b/jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java
index 22be6aecb4c..c9c0be24cca 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/LibrariesResource.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
+import org.jabref.http.server.services.ContextsToServe;
 import org.jabref.http.server.services.FilesToServe;
 import org.jabref.logic.util.io.BackupFileUtil;
 
@@ -15,6 +17,9 @@
 
 @Path("libraries")
 public class LibrariesResource {
+    @Inject
+    private ContextsToServe contextsToServe;
+
     @Inject
     private FilesToServe filesToServe;
 
@@ -24,9 +29,16 @@ public class LibrariesResource {
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public String get() {
-        List<String> fileNamesWithUniqueSuffix = filesToServe.getFilesToServe().stream()
-                                                            .map(p -> p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p))
-                                                            .toList();
+        Stream<java.nio.file.Path> pathStream;
+        if (!filesToServe.isEmpty()) {
+            pathStream = filesToServe.getFilesToServe().stream();
+        } else {
+            pathStream = contextsToServe.getContextsToServe().stream()
+                                                       .filter(context -> context.getDatabasePath().isPresent())
+                                                       .map(context -> context.getDatabasePath().get());
+        }
+        List<String> fileNamesWithUniqueSuffix = pathStream.map(path -> path.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(path))
+                                                           .toList();
         List<String> result = new ArrayList<>(fileNamesWithUniqueSuffix);
         result.add("demo");
         return gson.toJson(result);
diff --git a/jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java b/jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java
index 3eae56cf22d..50525897ea8 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/LibraryResource.java
@@ -8,9 +8,11 @@
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.jabref.http.JabrefMediaType;
 import org.jabref.http.dto.BibEntryDTO;
+import org.jabref.http.server.services.ContextsToServe;
 import org.jabref.http.server.services.FilesToServe;
 import org.jabref.logic.citationstyle.JabRefItemDataProvider;
 import org.jabref.logic.importer.ParserResult;
@@ -18,6 +20,7 @@
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.io.BackupFileUtil;
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
@@ -44,6 +47,9 @@ public class LibraryResource {
     @Inject
     CliPreferences preferences;
 
+    @Inject
+    ContextsToServe contextsToServe;
+
     @Inject
     FilesToServe filesToServe;
 
@@ -53,11 +59,11 @@ public class LibraryResource {
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public String getJson(@PathParam("id") String id) throws IOException {
-        ParserResult parserResult = getParserResult(id);
+        BibDatabaseContext databaseContext = getDatabaseContext(id);
         BibEntryTypesManager entryTypesManager = Injector.instantiateModelOrService(BibEntryTypesManager.class);
-        List<BibEntryDTO> list = parserResult.getDatabase().getEntries().stream()
+        List<BibEntryDTO> list = databaseContext.getDatabase().getEntries().stream()
                                              .peek(bibEntry -> bibEntry.getSharedBibEntryData().setSharedID(Objects.hash(bibEntry)))
-                                             .map(entry -> new BibEntryDTO(entry, parserResult.getDatabaseContext().getMode(), preferences.getFieldPreferences(), entryTypesManager))
+                                             .map(entry -> new BibEntryDTO(entry, databaseContext.getMode(), preferences.getFieldPreferences(), entryTypesManager))
                                              .toList();
         return gson.toJson(list);
     }
@@ -65,9 +71,9 @@ public String getJson(@PathParam("id") String id) throws IOException {
     @GET
     @Produces(JabrefMediaType.JSON_CSL_ITEM)
     public String getClsItemJson(@PathParam("id") String id) throws IOException {
-        ParserResult parserResult = getParserResult(id);
+        BibDatabaseContext databaseContext = getDatabaseContext(id);
         JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
-        jabRefItemDataProvider.setData(parserResult.getDatabaseContext(), new BibEntryTypesManager());
+        jabRefItemDataProvider.setData(databaseContext, new BibEntryTypesManager());
         return jabRefItemDataProvider.toJson();
     }
 
@@ -109,25 +115,33 @@ private java.nio.file.Path getLibraryPath(String id) {
                           .orElseThrow(NotFoundException::new);
     }
 
-    private ParserResult getParserResult(String id) throws IOException {
+    private BibDatabaseContext getDatabaseContext(String id) throws IOException {
         BibtexImporter bibtexImporter = new BibtexImporter(preferences.getImportFormatPreferences(), new DummyFileUpdateMonitor());
 
         if ("demo".equals(id)) {
             try (InputStream chocolateBibInputStream = getChocolateBibAsStream()) {
                 BufferedReader reader = new BufferedReader(new InputStreamReader(chocolateBibInputStream, StandardCharsets.UTF_8));
-                return bibtexImporter.importDatabase(reader);
+                return bibtexImporter.importDatabase(reader).getDatabaseContext();
             }
         }
 
         java.nio.file.Path library = getLibraryPath(id);
-        ParserResult parserResult;
-        try {
-            parserResult = bibtexImporter.importDatabase(library);
-        } catch (IOException e) {
-            LOGGER.warn("Could not find open library file {}", library, e);
-            throw new InternalServerErrorException("Could not parse library", e);
+        if (!filesToServe.isEmpty()) {
+            ParserResult parserResult;
+            try {
+                parserResult = bibtexImporter.importDatabase(library);
+            } catch (IOException e) {
+                LOGGER.warn("Could not find open library file {}", library, e);
+                throw new InternalServerErrorException("Could not parse library", e);
+            }
+            return parserResult.getDatabaseContext();
         }
-        return parserResult;
+
+        // contextsToServe.isEmpty() could be true when no libraries are opened in JabRef
+        return contextsToServe.getContextsToServe().stream()
+                       .filter(context -> context.getDatabasePath().equals(Optional.of(library)))
+                       .findFirst()
+                       .orElseThrow(() -> new NotFoundException("No library with id " + id + " found"));
     }
 
     /// @return a stream to the Chocolate.bib file in the classpath (is null only if the file was moved or there are issues with the classpath)
diff --git a/jabsrv/src/main/java/org/jabref/http/server/Server.java b/jabsrv/src/main/java/org/jabref/http/server/Server.java
index 5ce92b99771..439db74d17c 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/Server.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/Server.java
@@ -7,12 +7,16 @@
 
 import javax.net.ssl.SSLContext;
 
+import javafx.collections.ObservableList;
+
 import org.jabref.http.dto.GlobalExceptionMapper;
 import org.jabref.http.dto.GsonFactory;
 import org.jabref.http.server.cayw.CAYWResource;
 import org.jabref.http.server.cayw.format.FormatterService;
+import org.jabref.http.server.services.ContextsToServe;
 import org.jabref.http.server.services.FilesToServe;
 import org.jabref.logic.os.OS;
+import org.jabref.model.database.BibDatabaseContext;
 
 import net.harawata.appdirs.AppDirsFactory;
 import org.glassfish.grizzly.http.server.HttpServer;
@@ -28,29 +32,66 @@
 public class Server {
     private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
 
-    /// TODO: Use an observable list of BibDatabaseContexts
+    /// Entry point for the CLI
     public HttpServer run(List<Path> files, URI uri) {
-        List filesToServe;
+        List<Path> filesToServeList;
         if (files == null || files.isEmpty()) {
             LOGGER.debug("No library available to serve, serving the demo library...");
             // Server.class.getResource("...") is always null here, thus trying relative path
             // Path bibPath = Path.of(Server.class.getResource("http-server-demo.bib").toURI());
             Path bibPath = Path.of("src/main/resources/org/jabref/http/server/http-server-demo.bib").toAbsolutePath();
             LOGGER.debug("Location of demo library: {}", bibPath);
-            filesToServe = List.of(bibPath);
+            filesToServeList = List.of(bibPath);
         } else {
-            filesToServe = files;
+            filesToServeList = files;
         }
 
-        LOGGER.debug("Libraries to serve: {}", filesToServe);
+        LOGGER.debug("Libraries to serve: {}", filesToServeList);
+
+        FilesToServe filesToServe = new FilesToServe();
+        filesToServe.setFilesToServe(filesToServeList);
+
+        ContextsToServe contextsToServe = new ContextsToServe();
+
+        ServiceLocator serviceLocator = ServiceLocatorUtilities.createAndPopulateServiceLocator();
+        ServiceLocatorUtilities.addOneConstant(serviceLocator, filesToServe);
+        ServiceLocatorUtilities.addOneConstant(serviceLocator, contextsToServe);
+        HttpServer httpServer = startServer(serviceLocator, uri);
 
-        FilesToServe filesToServeService = new FilesToServe();
-        filesToServeService.setFilesToServe(filesToServe);
+        // Required for CLI only
+        // GUI uses HttpServerManager
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            try {
+                System.out.println("Shutting down jabsrv...");
+                httpServer.shutdownNow();
+                System.out.println("Done, exit.");
+            } catch (Exception e) {
+                LOGGER.error("Could not shut down server", e);
+            }
+        }));
+
+        return httpServer;
+    }
+
+    ///  Entry point for the GUI
+    public HttpServer run(ObservableList<BibDatabaseContext> files, URI uri) {
+        FilesToServe filesToServe = new FilesToServe();
+
+        ContextsToServe contextsToServe = new ContextsToServe();
+        contextsToServe.setContextsToServe(files);
+
+        ServiceLocator serviceLocator = ServiceLocatorUtilities.createAndPopulateServiceLocator();
+        ServiceLocatorUtilities.addOneConstant(serviceLocator, filesToServe);
+        ServiceLocatorUtilities.addOneConstant(serviceLocator, contextsToServe);
 
-        return startServer(filesToServeService, uri);
+        return startServer(serviceLocator, uri);
     }
 
     private HttpServer startServer(ServiceLocator serviceLocator, URI uri) {
+        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new GsonFactory());
+        ServiceLocatorUtilities.addOneConstant(serviceLocator, new FormatterService());
+        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new PreferencesFactory());
+
         // see https://stackoverflow.com/a/33794265/873282
         final ResourceConfig resourceConfig = new ResourceConfig();
         // TODO: Add SSL
@@ -65,28 +106,6 @@ private HttpServer startServer(ServiceLocator serviceLocator, URI uri) {
         final HttpServer httpServer =
                 GrizzlyHttpServerFactory
                         .createHttpServer(uri, resourceConfig, serviceLocator);
-        return httpServer;
-    }
-
-    private HttpServer startServer(FilesToServe filesToServe, URI uri) {
-        ServiceLocator serviceLocator = ServiceLocatorUtilities.createAndPopulateServiceLocator();
-        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new GsonFactory());
-        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new PreferencesFactory());
-        ServiceLocatorUtilities.addOneConstant(serviceLocator, new FormatterService());
-        ServiceLocatorUtilities.addOneConstant(serviceLocator, filesToServe);
-
-        final HttpServer httpServer = startServer(serviceLocator, uri);
-
-        // TODO: Enable use of GUI StateManager
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            try {
-                System.out.println("Shutting down jabsrv...");
-                httpServer.shutdownNow();
-                System.out.println("Done, exit.");
-            } catch (Exception e) {
-                LOGGER.error("Could not shut down server", e);
-            }
-        }));
 
         return httpServer;
     }
diff --git a/jabsrv/src/main/java/org/jabref/http/server/services/ContextsToServe.java b/jabsrv/src/main/java/org/jabref/http/server/services/ContextsToServe.java
new file mode 100644
index 00000000000..e1d73b38073
--- /dev/null
+++ b/jabsrv/src/main/java/org/jabref/http/server/services/ContextsToServe.java
@@ -0,0 +1,24 @@
+package org.jabref.http.server.services;
+
+import javafx.collections.ObservableList;
+
+import org.jabref.model.database.BibDatabaseContext;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class ContextsToServe {
+    private ObservableList<BibDatabaseContext> contextsToServe;
+
+    public void setContextsToServe(ObservableList<BibDatabaseContext> contextsToServe) {
+        this.contextsToServe = contextsToServe;
+    }
+
+    public ObservableList<BibDatabaseContext> getContextsToServe() {
+        return contextsToServe;
+    }
+
+    public boolean isEmpty() {
+        return contextsToServe == null || contextsToServe.isEmpty();
+    }
+}
diff --git a/jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java b/jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
index d81424b6dde..1638f0bd290 100644
--- a/jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
+++ b/jabsrv/src/main/java/org/jabref/http/server/services/FilesToServe.java
@@ -16,4 +16,8 @@ public void setFilesToServe(List<Path> filesToServe) {
     public List<Path> getFilesToServe() {
         return filesToServe;
     }
+
+    public boolean isEmpty() {
+        return filesToServe == null || filesToServe.isEmpty();
+    }
 }
diff --git a/jabsrv/src/test/java/org/jabref/http/server/LibrariesResourceTest.java b/jabsrv/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
index b1ca6efdffa..dd9e25a0da8 100644
--- a/jabsrv/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
+++ b/jabsrv/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
@@ -14,6 +14,7 @@ class LibrariesResourceTest extends ServerTest {
     protected Application configure() {
         ResourceConfig resourceConfig = new ResourceConfig(LibrariesResource.class);
         addFilesToServeToResourceConfig(resourceConfig);
+        addContextsToServeToResourceConfig(resourceConfig);
         addGsonToResourceConfig(resourceConfig);
         addGlobalExceptionMapperToResourceConfig(resourceConfig);
         return resourceConfig.getApplication();
diff --git a/jabsrv/src/test/java/org/jabref/http/server/LibraryResourceTest.java b/jabsrv/src/test/java/org/jabref/http/server/LibraryResourceTest.java
index e37c884cced..679a75b54ba 100644
--- a/jabsrv/src/test/java/org/jabref/http/server/LibraryResourceTest.java
+++ b/jabsrv/src/test/java/org/jabref/http/server/LibraryResourceTest.java
@@ -14,6 +14,7 @@ class LibraryResourceTest extends ServerTest {
     protected Application configure() {
         ResourceConfig resourceConfig = new ResourceConfig(LibraryResource.class, LibrariesResource.class);
         addFilesToServeToResourceConfig(resourceConfig);
+        addContextsToServeToResourceConfig(resourceConfig);
         addPreferencesToResourceConfig(resourceConfig);
         addGsonToResourceConfig(resourceConfig);
         return resourceConfig.getApplication();
diff --git a/jabsrv/src/test/java/org/jabref/http/server/ServerTest.java b/jabsrv/src/test/java/org/jabref/http/server/ServerTest.java
index 0c7e83053d5..36e77d81491 100644
--- a/jabsrv/src/test/java/org/jabref/http/server/ServerTest.java
+++ b/jabsrv/src/test/java/org/jabref/http/server/ServerTest.java
@@ -5,6 +5,7 @@
 
 import org.jabref.http.dto.GlobalExceptionMapper;
 import org.jabref.http.dto.GsonFactory;
+import org.jabref.http.server.services.ContextsToServe;
 import org.jabref.http.server.services.FilesToServe;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -60,6 +61,15 @@ protected void configure() {
         });
     }
 
+    protected void addContextsToServeToResourceConfig(ResourceConfig resourceConfig) {
+        resourceConfig.register(new AbstractBinder() {
+            @Override
+            protected void configure() {
+                bind(new ContextsToServe()).to(ContextsToServe.class);
+            }
+        });
+    }
+
     protected void addGsonToResourceConfig(ResourceConfig resourceConfig) {
         resourceConfig.register(new AbstractBinder() {
             @Override
diff --git a/jabsrv/src/test/rest-api.http b/jabsrv/src/test/rest-api.http
index 471b1fccaab..e25f9b003ed 100644
--- a/jabsrv/src/test/rest-api.http
+++ b/jabsrv/src/test/rest-api.http
@@ -14,11 +14,11 @@
 
 ### Get a HTML page asking the user to go to /libraries
 
-GET http://localhost:6050
+GET http://localhost:23119
 
 ### Get the list of all libraries
 
-GET http://localhost:6050/libraries
+GET http://localhost:23119/libraries
 Accept: application/json
 
 ## demo cases
@@ -27,12 +27,12 @@ Accept: application/json
 
 ### Get JSON of Chocolate.bib
 
-GET http://localhost:6050/libraries/demo
+GET http://localhost:23119/libraries/demo
 Accept: application/json
 
 ### Get plain BibTeX of Chocolate.bib
 
-GET http://localhost:6050/libraries/demo
+GET http://localhost:23119/libraries/demo
 Accept: application/x-bibtex
 
 ### Get CSL JSON of Chocolate.bib
@@ -40,19 +40,19 @@ Accept: application/x-bibtex
 // if you have checkout the JabRef code at c:\git-repositories\jabref, then this
 // will show the contents of your first opened library using CSL JSON
 
-GET http://localhost:6050/libraries/demo
+GET http://localhost:23119/libraries/demo
 Accept: application/x-bibtex-library-csl+json
 
 ## From here: C:\git-repositories\JabRef\jablib\src\main\resources\Chocolate.bib is required
 
 ### Get BibTeX of C:\git-repositories\JabRef\jablib\src\main\resources\Chocolate.bib
 
-GET http://localhost:6050/libraries/Chocolate.bib-6a732609
+GET http://localhost:23119/libraries/Chocolate.bib-6a732609
 Accept: application/x-bibtex
 
 ### Get JSON of C:\git-repositories\JabRef\jablib\src\main\resources\Chocolate.bib
 
-GET http://localhost:6050/libraries/Chocolate.bib-6a732609
+GET http://localhost:23119/libraries/Chocolate.bib-6a732609
 Accept: application/json
 
 ### Get CSL JSON of C:\git-repositories\JabRef\jablib\src\main\resources\Chocolate.bib
@@ -60,11 +60,11 @@ Accept: application/json
 // if you have checkout the JabRef code at c:\git-repositories\jabref, then this
 // will show the contents of your first opened library using CSL JSON
 
-GET http://localhost:6050/libraries/Chocolate.bib-6a732609
+GET http://localhost:23119/libraries/Chocolate.bib-6a732609
 Accept: application/x-bibtex-library-csl+json
 
 ## Error cases
 
 ### GET not avaialble library
 
-GET http://localhost:6050/libraries/notfound
+GET http://localhost:23119/libraries/notfound