diff --git a/C/sysbits.c b/C/sysbits.c
index f439df211..a13c3f341 100755
--- a/C/sysbits.c
+++ b/C/sysbits.c
@@ -3211,7 +3211,7 @@ Yap_InitSysPreds(void)
   Yap_InitCPred ("virtual_alarm", 4, p_virtual_alarm, SafePredFlag|SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred ("enable_interrupts", 0, p_enable_interrupts, SafePredFlag);
   Yap_InitCPred ("disable_interrupts", 0, p_disable_interrupts, SafePredFlag);
-  CurrentModule = SYSTEM_MODULE;
+  CurrentModule = OPERATING_SYSTEM_MODULE;
   Yap_InitCPred ("true_file_name", 2, p_true_file_name, SyncPredFlag);
   Yap_InitCPred ("true_file_name", 3, p_true_file_name3, SyncPredFlag);
   CurrentModule = cm;
diff --git a/H/dhstruct.h b/H/dhstruct.h
index 868599557..3f5cc9fe7 100644
--- a/H/dhstruct.h
+++ b/H/dhstruct.h
@@ -90,6 +90,7 @@
 #define CHARSIO_MODULE Yap_heap_regs->charsio_module
 #define TERMS_MODULE Yap_heap_regs->terms_module
 #define SYSTEM_MODULE Yap_heap_regs->system_module
+#define OPERATING_SYSTEM_MODULE Yap_heap_regs->operating_system_module
 #define READUTIL_MODULE Yap_heap_regs->readutil_module
 #define HACKS_MODULE Yap_heap_regs->hacks_module
 #define ARG_MODULE Yap_heap_regs->arg_module
diff --git a/H/hstruct.h b/H/hstruct.h
index d1a1d579e..b8aaa9968 100644
--- a/H/hstruct.h
+++ b/H/hstruct.h
@@ -90,6 +90,7 @@
   Term  charsio_module;
   Term  terms_module;
   Term  system_module;
+  Term  operating_system_module;
   Term  readutil_module;
   Term  hacks_module;
   Term  arg_module;
diff --git a/H/iatoms.h b/H/iatoms.h
index cd71822b0..7b9270076 100644
--- a/H/iatoms.h
+++ b/H/iatoms.h
@@ -184,6 +184,7 @@
   AtomOnline = Yap_LookupAtom("online");
   AtomOpen = Yap_LookupAtom("open");
   AtomOperatingSystemError = Yap_LookupAtom("operating_system_error");
+  AtomOperatingSystemSupport = Yap_LookupAtom("operating_system_support");
   AtomOperator = Yap_LookupAtom("operator");
   AtomOperatorPriority = Yap_LookupAtom("operator_priority");
   AtomOperatorSpecifier = Yap_LookupAtom("operator_specifier");
diff --git a/H/ihstruct.h b/H/ihstruct.h
index ad5aad982..549b1a1f7 100644
--- a/H/ihstruct.h
+++ b/H/ihstruct.h
@@ -90,6 +90,7 @@
   Yap_heap_regs->charsio_module = MkAtomTerm(AtomCharsio);
   Yap_heap_regs->terms_module = MkAtomTerm(AtomTerms);
   Yap_heap_regs->system_module = MkAtomTerm(AtomSystem);
+  Yap_heap_regs->operating_system_module = MkAtomTerm(AtomOperatingSystemSupport);
   Yap_heap_regs->readutil_module = MkAtomTerm(AtomReadutil);
   Yap_heap_regs->hacks_module = MkAtomTerm(AtomYapHacks);
   Yap_heap_regs->arg_module = MkAtomTerm(AtomArg);
diff --git a/H/ratoms.h b/H/ratoms.h
index 5bbe1b87c..3f4f568fc 100644
--- a/H/ratoms.h
+++ b/H/ratoms.h
@@ -184,6 +184,7 @@
   AtomOnline = AtomAdjust(AtomOnline);
   AtomOpen = AtomAdjust(AtomOpen);
   AtomOperatingSystemError = AtomAdjust(AtomOperatingSystemError);
+  AtomOperatingSystemSupport = AtomAdjust(AtomOperatingSystemSupport);
   AtomOperator = AtomAdjust(AtomOperator);
   AtomOperatorPriority = AtomAdjust(AtomOperatorPriority);
   AtomOperatorSpecifier = AtomAdjust(AtomOperatorSpecifier);
diff --git a/H/rhstruct.h b/H/rhstruct.h
index 77cf8d101..9c8002ae2 100644
--- a/H/rhstruct.h
+++ b/H/rhstruct.h
@@ -90,6 +90,7 @@
   Yap_heap_regs->charsio_module = AtomTermAdjust(Yap_heap_regs->charsio_module);
   Yap_heap_regs->terms_module = AtomTermAdjust(Yap_heap_regs->terms_module);
   Yap_heap_regs->system_module = AtomTermAdjust(Yap_heap_regs->system_module);
+  Yap_heap_regs->operating_system_module = AtomTermAdjust(Yap_heap_regs->operating_system_module);
   Yap_heap_regs->readutil_module = AtomTermAdjust(Yap_heap_regs->readutil_module);
   Yap_heap_regs->hacks_module = AtomTermAdjust(Yap_heap_regs->hacks_module);
   Yap_heap_regs->arg_module = AtomTermAdjust(Yap_heap_regs->arg_module);
diff --git a/H/tatoms.h b/H/tatoms.h
index 0d53e7caf..00d3b3d0b 100644
--- a/H/tatoms.h
+++ b/H/tatoms.h
@@ -366,6 +366,8 @@
 #define AtomOpen Yap_heap_regs->AtomOpen_
   Atom AtomOperatingSystemError_;
 #define AtomOperatingSystemError Yap_heap_regs->AtomOperatingSystemError_
+  Atom AtomOperatingSystemSupport_;
+#define AtomOperatingSystemSupport Yap_heap_regs->AtomOperatingSystemSupport_
   Atom AtomOperator_;
 #define AtomOperator Yap_heap_regs->AtomOperator_
   Atom AtomOperatorPriority_;
diff --git a/misc/ATOMS b/misc/ATOMS
index 9c1b75e53..36aa9f297 100644
--- a/misc/ATOMS
+++ b/misc/ATOMS
@@ -189,6 +189,7 @@ A	On			N	"on"
 A	Online			N	"online"
 A	Open			N	"open"
 A	OperatingSystemError	N	"operating_system_error"
+A	OperatingSystemSupport	N	"operating_system_support"
 A	Operator		N	"operator"
 A	OperatorPriority	N	"operator_priority"
 A	OperatorSpecifier	N	"operator_specifier"
diff --git a/misc/HEAPFIELDS b/misc/HEAPFIELDS
index 2a0f5f239..833798172 100644
--- a/misc/HEAPFIELDS
+++ b/misc/HEAPFIELDS
@@ -93,6 +93,7 @@ Term		attributes_module	ATTRIBUTES_MODULE	MkAT AtomAttributes
 Term		charsio_module		CHARSIO_MODULE		MkAT AtomCharsio
 Term		terms_module		TERMS_MODULE		MkAT AtomTerms
 Term		system_module		SYSTEM_MODULE		MkAT AtomSystem
+Term		operating_system_module	OPERATING_SYSTEM_MODULE	MkAT AtomOperatingSystemSupport
 Term		readutil_module		READUTIL_MODULE		MkAT AtomReadutil
 Term		hacks_module		HACKS_MODULE		MkAT AtomYapHacks
 Term		arg_module		ARG_MODULE		MkAT AtomArg