diff --git a/recipes-angstrom/angstrom/cpufreq-tweaks.bb b/recipes-angstrom/angstrom/cpufreq-tweaks.bb
new file mode 100644
index 0000000..b11530b
--- /dev/null
+++ b/recipes-angstrom/angstrom/cpufreq-tweaks.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "CPU-freq tweaks for angstrom"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+inherit allarch systemd
+
+#PV = "${DISTRO_VERSION}"
+
+SRC_URI = "file://cpu-ondemand.timer \
+           file://cpu-ondemand.service \
+          "	
+
+do_compile() {
+	:
+}
+
+
+do_install () {
+
+	install -d ${D}/${base_libdir}/systemd/system
+	install -m 0644 ${WORKDIR}/cpu-ondemand.* ${D}/${base_libdir}/systemd/system/
+}
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "cpu-ondemand.timer"
+
+FILES_${PN} += "${base_libdir}/systemd"
+RDEPENDS_${PN} = "cpufrequtils"
+
diff --git a/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.service b/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.service
new file mode 100644
index 0000000..c6749b1
--- /dev/null
+++ b/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Switch to ondemand CPU-freq governor
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cpufreq-set -g ondemand
diff --git a/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.timer b/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.timer
new file mode 100644
index 0000000..db7b220
--- /dev/null
+++ b/recipes-angstrom/angstrom/cpufreq-tweaks/cpu-ondemand.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Switches to ondemand CPU-freq governor 10 minutes after boot
+
+[Timer]
+# Time to wait after booting before we run first time
+OnBootSec=10min
+Unit=cpu-ondemand.service
+
+[Install]
+WantedBy=multi-user.target