diff --git a/plugins/raspberrypi/raspi_temp b/plugins/raspberrypi/raspi_temp
new file mode 100755
index 00000000..41a4c0e0
--- /dev/null
+++ b/plugins/raspberrypi/raspi_temp
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Munin plugin for measuring the core temperature of the BCM2835 SoC on a
+# Raspberry Pi.
+#
+# Add the following lines to /etc/munin/plugin-conf.d/raspi_temp:
+#
+# [raspi_temp]
+# user root
+#
+# Copyright (c) 2014, Petteri Valkonen <petteri.valkonen@iki.fi>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the copyright holder nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#%# family=contrib
+#
+case $1 in
+    config)
+        cat <<'EOM'
+graph_title BCM2835 core temperature
+graph_vlabel temp in C
+graph_args --base 1000 -l 0
+graph_category Temperature
+temp.label Temperature
+temp.warning 60
+temp.critical 85
+EOM
+        exit 0;;
+esac
+
+echo "temp.value `/opt/vc/bin/vcgencmd measure_temp | sed -n "s/temp=\(.*\)'C/\1/p"`"