diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
new file mode 100644
index 0000000000..9dedfe325b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
@@ -0,0 +1,27 @@
+#cloud-config
+
+coreos:
+  units:
+    - name: oem-cloudinit.service
+      command: restart
+      runtime: yes
+      content: |
+        [Unit]
+        Description=Cloudinit from CloudSigma metadata
+
+        [Service]
+        Type=oneshot
+        ExecStart=/usr/bin/coreos-cloudinit --oem=cloudsigma
+  oem:
+    id: cloudsigma
+    name: CloudSigma
+    version-id: @@OEM_VERSION_ID@@
+    home-url: https://www.cloudsigma.com/
+    bug-report-url: https://github.com/coreos/bugs/issues
+
+write_files:
+  - path: /run/systemd/system/etcd.service.d/10-oem.conf
+    permissions: 0644
+    content: |
+      [Service]
+      Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild
new file mode 100644
index 0000000000..4edfd6e6e8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright (c) 2015 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="OEM suite for CloudSigma images"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# no source directory
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
+	    ${FILESDIR}/cloud-config.yml > ${T}/cloud-config.yml || die
+}
+
+src_install() {
+	insinto "/usr/share/oem"
+	doins ${T}/cloud-config.yml
+}