diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx
index f1f5ddf55..847290764 100644
--- a/src/lib/libraries/extensions/index.jsx
+++ b/src/lib/libraries/extensions/index.jsx
@@ -14,6 +14,8 @@ import ev3Image from './ev3.png';
 import wedoImage from './wedo.png';
 import text2speechImage from './text2speech.png';
 import text2speechInsetImage from './text2speech-small.svg';
+import makeymakeyImage from './makeymakey.png';
+import makeymakeyInsetImage from './makeymakey-small.svg';
 
 import microbitPeripheralImage from './peripheral-connection/microbit/microbit-illustration.svg';
 import microbitMenuImage from './peripheral-connection/microbit/microbit-small.svg';
@@ -128,6 +130,21 @@ export default [
         featured: true,
         internetConnectionRequired: true
     },
+    {
+        name: 'Makey Makey',
+        extensionId: 'makeymakey',
+        collaborator: 'JoyLabz',
+        iconURL: makeymakeyImage,
+        insetIconURL: makeymakeyInsetImage,
+        description: (
+            <FormattedMessage
+                defaultMessage="Make anything into a key."
+                description="Description for the 'Makey Makey' extension"
+                id="gui.extension.makeymakey.description"
+            />
+        ),
+        featured: true
+    },
     {
         name: 'micro:bit',
         extensionId: 'microbit',
diff --git a/src/lib/libraries/extensions/makeymakey-small.svg b/src/lib/libraries/extensions/makeymakey-small.svg
new file mode 100644
index 000000000..a8062f30e
--- /dev/null
+++ b/src/lib/libraries/extensions/makeymakey-small.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><style>.st2{fill:red}.st3{fill:#e0e0e0}.st4{fill:none;stroke:#666;stroke-width:.5;stroke-miterlimit:10}</style><path d="M35 28H5a1 1 0 0 1-1-1V12c0-.6.4-1 1-1h30c.5 0 1 .4 1 1v15c0 .5-.5 1-1 1z" fill="#fff" id="Layer_6"/><g id="Layer_4"><path class="st2" d="M4 25h32v2.7H4zM13 24h-2.2a1 1 0 0 1-1-1v-9.7c0-.6.4-1 1-1H13c.6 0 1 .4 1 1V23c0 .6-.5 1-1 1z"/><path class="st2" d="M6.1 19.3v-2.2c0-.5.4-1 1-1h9.7c.5 0 1 .5 1 1v2.2c0 .5-.5 1-1 1H7.1a1 1 0 0 1-1-1z"/><circle class="st2" cx="22.8" cy="18.2" r="3.4"/><circle class="st2" cx="30.6" cy="18.2" r="3.4"/><path class="st2" d="M4.2 27h31.9v.7H4.2z"/></g><g id="Layer_5"><circle class="st3" cx="22.8" cy="18.2" r="2.3"/><circle class="st3" cx="30.6" cy="18.2" r="2.3"/><path class="st3" d="M12.5 22.9h-1.2c-.3 0-.5-.2-.5-.5V14c0-.3.2-.5.5-.5h1.2c.3 0 .5.2.5.5v8.4c0 .3-.2.5-.5.5z"/><path class="st3" d="M7.2 18.7v-1.2c0-.3.2-.5.5-.5h8.4c.3 0 .5.2.5.5v1.2c0 .3-.2.5-.5.5H7.7c-.3 0-.5-.2-.5-.5zM4 26h32v2H4z"/></g><g id="Layer_3"><path class="st4" d="M35.2 27.9H4.8a1 1 0 0 1-1-1V12.1c0-.6.5-1 1-1h30.5c.5 0 1 .4 1 1V27a1 1 0 0 1-1.1.9z"/><path class="st4" d="M35.2 27.9H4.8a1 1 0 0 1-1-1V12.1c0-.6.5-1 1-1h30.5c.5 0 1 .4 1 1V27a1 1 0 0 1-1.1.9z"/></g></svg>
\ No newline at end of file
diff --git a/src/lib/libraries/extensions/makeymakey.png b/src/lib/libraries/extensions/makeymakey.png
new file mode 100644
index 000000000..8acd35bc1
Binary files /dev/null and b/src/lib/libraries/extensions/makeymakey.png differ