diff --git a/junixsocket-core/pom.xml b/junixsocket-core/pom.xml
index bd20d10f3..cbbd06b79 100644
--- a/junixsocket-core/pom.xml
+++ b/junixsocket-core/pom.xml
@@ -4,9 +4,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>junixsocket-core</artifactId>
-
-  <!-- <packaging>pom</packaging> --> <!-- Blocked by MCOMPILER-360 -->
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
 
   <parent>
     <groupId>com.kohlschutter.junixsocket</groupId>
diff --git a/junixsocket-core/src/main/java/com/kohlschutter/junixsocket/core/JUnixSocketCore.java b/junixsocket-core/src/main/java/com/kohlschutter/junixsocket/core/JUnixSocketCore.java
deleted file mode 100644
index a0998068e..000000000
--- a/junixsocket-core/src/main/java/com/kohlschutter/junixsocket/core/JUnixSocketCore.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.kohlschutter.junixsocket.core;
-
-/**
- * Just a placeholder class to keep Maven happy.
- * 
- * We would like to make junixsocket-core a POM-only artifact, but that is blocked on MCOMPILER-360.
- */
-final class JUnixSocketCore {
-  private JUnixSocketCore() {
-    throw new UnsupportedOperationException("No instances");
-  }
-}
diff --git a/junixsocket-core/src/main/java/module-info.java b/junixsocket-core/src/main/java/module-info.java
deleted file mode 100644
index 6642e5559..000000000
--- a/junixsocket-core/src/main/java/module-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-module com.kohlschutter.junixsocket.core {
-}
diff --git a/junixsocket-demo/pom.xml b/junixsocket-demo/pom.xml
index 903cc9e1f..3a4f59dd8 100644
--- a/junixsocket-demo/pom.xml
+++ b/junixsocket-demo/pom.xml
@@ -27,7 +27,7 @@
       <groupId>com.kohlschutter.junixsocket</groupId>
       <artifactId>junixsocket-core</artifactId>
       <version>${project.version}</version>
-      <!-- <type>pom</type> --> <!-- Blocked by MCOMPILER-360 -->
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>com.kohlschutter.junixsocket</groupId>
diff --git a/junixsocket-dist/pom.xml b/junixsocket-dist/pom.xml
index 15d4801aa..a66d5ab5a 100644
--- a/junixsocket-dist/pom.xml
+++ b/junixsocket-dist/pom.xml
@@ -26,6 +26,7 @@
       <groupId>com.kohlschutter.junixsocket</groupId>
       <artifactId>junixsocket-core</artifactId>
       <version>${project.version}</version>
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>com.kohlschutter.junixsocket</groupId>
diff --git a/junixsocket-selftest/pom.xml b/junixsocket-selftest/pom.xml
index 655385b6d..42e92dc23 100644
--- a/junixsocket-selftest/pom.xml
+++ b/junixsocket-selftest/pom.xml
@@ -110,6 +110,7 @@
       <groupId>com.kohlschutter.junixsocket</groupId>
       <artifactId>junixsocket-core</artifactId>
       <version>${project.version}</version>
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>com.kohlschutter.junixsocket</groupId>
diff --git a/src/site/markdown/dependency.md b/src/site/markdown/dependency.md
index 56b07d18d..8dad8d352 100644
--- a/src/site/markdown/dependency.md
+++ b/src/site/markdown/dependency.md
@@ -16,6 +16,8 @@ Add the following dependency to your Maven project
       <type>pom</type>
     </dependency>
 
+> **NOTE:** In junixsocket versions older than 2.4.0, the `<type>pom</type>` declaration must be omitted.
+
 [See here](customarch.html) how to add support for custom architectures that aren't supported out of the box.
     
 If you're going to use AFUNIXSocketServer code, add the following dependency: