diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b0e8227
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "CICMMetadata"]
+	path = CICMMetadata
+	url = https://github.com/claunia/CICMMetadata
diff --git a/CICMMetadata b/CICMMetadata
new file mode 160000
index 0000000..97781dd
--- /dev/null
+++ b/CICMMetadata
@@ -0,0 +1 @@
+Subproject commit 97781ddc50086a641ab2ae0816e0dd0298ab2ca5
diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog
index 6f61bb3..2c6b20e 100644
--- a/osrepodbmgr/ChangeLog
+++ b/osrepodbmgr/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24  Natalia Portillo  <claunia@claunia.com>
+
+	* osrepodbmgr.csproj:
+	  Added CICM Metadata submodule.
+
 2017-04-23  Natalia Portillo  <claunia@claunia.com>
 
 	* DBOps.cs:
diff --git a/osrepodbmgr/osrepodbmgr.csproj b/osrepodbmgr/osrepodbmgr.csproj
index 8c7cb29..69259ed 100644
--- a/osrepodbmgr/osrepodbmgr.csproj
+++ b/osrepodbmgr/osrepodbmgr.csproj
@@ -87,6 +87,9 @@
     <Compile Include="Settings.cs" />
     <Compile Include="PlatformID.cs" />
     <Compile Include="DetectOS.cs" />
+    <Compile Include="..\CICMMetadata\dotnet\cicm.cs">
+      <Link>cicm.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />