diff --git a/packages/hermes/namespaced/Api.Hermes.pp b/packages/hermes/namespaced/Api.Hermes.pp
new file mode 100644
index 0000000000..d80d4642cf
--- /dev/null
+++ b/packages/hermes/namespaced/Api.Hermes.pp
@@ -0,0 +1,3 @@
+unit Api.Hermes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i hermes.pp}
diff --git a/packages/hermes/namespaces.lst b/packages/hermes/namespaces.lst
new file mode 100644
index 0000000000..16ab6d2b86
--- /dev/null
+++ b/packages/hermes/namespaces.lst
@@ -0,0 +1,3 @@
+src/hermes.pp=namespaced/Api.Hermes.pp
+{s*:src/}=namespaced/
+{i+:src/}
diff --git a/packages/hermes/src/hermes.pp b/packages/hermes/src/hermes.pp
index ef4ca372e8..38304b7ac1 100644
--- a/packages/hermes/src/hermes.pp
+++ b/packages/hermes/src/hermes.pp
@@ -30,7 +30,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Hermes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}