diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
index 4fd0147961..3c0dc6c712 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/CodedBase.C
@@ -101,13 +101,17 @@ void Foam::CodedBase<CodedType>::writeCode(Ostream& os) const
 {
     writeEntry(os, "name", codeName_);
 
-    forAll(codeKeys_, i)
+    wordList codeAndBuildKeys(codeKeys_);
+    codeAndBuildKeys.append("codeOptions");
+    codeAndBuildKeys.append("codeLibs");
+
+    forAll(codeAndBuildKeys, i)
     {
-        if (dict_.found(codeKeys_[i]))
+        if (dict_.found(codeAndBuildKeys[i]))
         {
-            writeKeyword(os, codeKeys_[i]);
-            os.write(verbatimString(dict_[codeKeys_[i]]))
-            << token::END_STATEMENT << nl;
+            writeKeyword(os, codeAndBuildKeys[i]);
+            os.write(verbatimString(dict_[codeAndBuildKeys[i]]))
+                << token::END_STATEMENT << nl;
         }
     }
 }
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
index 879a6cd1ba..a156a44fd6 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C
@@ -37,7 +37,6 @@ Foam::CodedBase<Foam::codedFixedValuePointPatchFieldBase>::codeKeys_ =
 {
     "code",
     "codeInclude",
-    "codeOptions",
     "localCode"
 };
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
index 5d7416e5b1..6d2de3f924 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
@@ -45,8 +45,7 @@ template<>
 const Foam::wordList Foam::CodedBase<Foam::Function1s::coded>::codeKeys_ =
 {
     "code",
-    "codeInclude",
-    "codeOptions"
+    "codeInclude"
 };
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
index b29fa51a48..8e9a12dc8e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C
@@ -37,7 +37,6 @@ Foam::CodedBase<Foam::codedFixedValueFvPatchFieldBase>::codeKeys_ =
 {
     "code",
     "codeInclude",
-    "codeOptions",
     "localCode"
 };
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
index 2c44265f71..3bd2005849 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchFields.C
@@ -37,7 +37,6 @@ Foam::CodedBase<Foam::codedMixedFvPatchFieldBase>::codeKeys_ =
 {
     "code",
     "codeInclude",
-    "codeOptions",
     "localCode"
 };
 
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index 7a09ed12c2..4ea9eb908b 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -42,7 +42,6 @@ const Foam::wordList Foam::CodedBase<Foam::functionObject>::codeKeys_ =
     "codeEnd",
     "codeExecute",
     "codeInclude",
-    "codeOptions",
     "codeRead",
     "codeWrite",
     "localCode"
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 6045441e05..9f63c53479 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -39,7 +39,6 @@ const Foam::wordList Foam::fv::CodedSource<Type>::codeKeys_ =
     "codeAddAlphaRhoSup",
     "codeCorrect",
     "codeInclude",
-    "codeOptions",
     "codeSetValue",
     "localCode"
 };