diff --git a/.gitignore b/.gitignore
index 4f7c4e34a..aa013b097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,8 @@ dist/converse.min.js
 dist/converse-no-jquery.js
 dist/converse-no-jquery.min.js
 dist/converse-mobile.min.js
+dist/converse-muc-embedded.js
+dist/converse-muc-embedded.min.js
 
 css/*.map
 css/*.min.css
diff --git a/Makefile b/Makefile
index 82db05223..4b08620d3 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,8 @@ BUILDS = dist/converse.js \
 		 dist/converse.min.js \
          dist/converse-mobile.js \
          dist/converse-mobile.min.js \
+         dist/converse-muc-embedded.js \
+         dist/converse-muc-embedded.min.js \
          dist/converse-no-jquery.js \
  		 dist/converse-no-jquery.min.js \
 		 dist/converse-no-dependencies.min.js \
@@ -161,6 +163,10 @@ dist/converse-mobile.min.js: src locale node_modules *.js
 	$(RJS) -o src/build.js paths.converse=src/converse-mobile include=converse out=dist/converse-mobile.min.js
 dist/converse-mobile.js: src locale node_modules *.js
 	$(RJS) -o src/build.js paths.converse=src/converse-mobile include=converse out=dist/converse-mobile.js optimize=none 
+dist/converse-muc-embedded.min.js: src locale node_modules *.js
+	$(RJS) -o src/build.js paths.converse=src/converse-embedded include=converse out=dist/converse-muc-embedded.min.js
+dist/converse-muc-embedded.js: src locale node_modules *.js
+	$(RJS) -o src/build.js paths.converse=src/converse-embedded include=converse out=dist/converse-muc-embedded.js optimize=none 
 
 .PHONY: jsmin
 jsmin: $(BUILDS)
diff --git a/demo/embedded.html b/demo/embedded.html
index aeb44ba2c..84f809d3e 100644
--- a/demo/embedded.html
+++ b/demo/embedded.html
@@ -11,14 +11,13 @@
     <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
     <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/font-awesome/css/font-awesome.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/theme.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse-muc-embedded.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/theme.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/converse-muc-embedded.min.css" />
     <script type="text/javascript" src="../analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 9]>
-    <script src="../node_modules/requirejs/require.js"></script>
-    <script src="../src/config.js"></script>
+	<script src="../dist/converse-muc-embedded.min.js"></script>
     <![endif]>
 </head>
 
@@ -54,42 +53,45 @@
 </body>
 
 <script>
-    require.config({baseUrl: '../'});
-    require(['converse-core', 'converse-muc-embedded'], function (converse) {
-        converse.initialize({
-            allow_logout: false, // No point in logging out when we have auto_login as true.
-            allow_muc_invitations: false, // Doesn't make sense to allow because only
-                                          // roster contacts can be invited
-            allow_contact_requests: false, // Contacts from other servers cannot,
-                                           // be added and anonymous users don't
-                                           // know one another's JIDs, so disabling.
-            auto_reconnect: true,
-            authentication: 'anonymous',
-            auto_login: true,
-            auto_join_rooms: [
-                'anonymous@conference.nomnom.im',
-            ],
-            blacklisted_plugins: [
-                'converse-controlbox',
-                'converse-dragresize',
-                'converse-minimize',
-                'converse-vcard'
-            ],
-            notify_all_room_messages: [
-                'anonymous@conference.nomnom.im',
-            ],
-            bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
-            jid: 'nomnom.im', // XMPP server which allows anonymous login (doesn't
-                              // allow chatting with other XMPP servers).
-            keepalive: true,
-            hide_muc_server: true, // Federation is disabled, so no use in
-                                   // showing the MUC server.
-            play_sounds: true,
-            show_controlbox_by_default: false,
-            strict_plugin_dependencies: false,
-            whitelisted_plugins: ['converse-muc-embedded'],
-            debug: true
-        });
+    converse.initialize({
+        allow_logout: false, // No point in logging out when we have auto_login as true.
+        allow_muc_invitations: false, // Doesn't make sense to allow because only
+                                        // roster contacts can be invited
+        allow_contact_requests: false, // Contacts from other servers cannot,
+                                        // be added and anonymous users don't
+                                        // know one another's JIDs, so disabling.
+        auto_reconnect: true,
+        authentication: 'anonymous',
+        auto_login: true,
+        auto_join_rooms: [
+            'anonymous@conference.nomnom.im',
+        ],
+        // Whitelist non-core plugins that we need
+        whitelisted_plugins: ['converse-muc-embedded'],
+        // Blacklist plugins which aren't included in the build file, 
+        // so that other code cannot register their own plugins under
+        // those names.
+        blacklisted_plugins: [
+            "converse-bookmarks",
+            "converse-controlbox",
+            "converse-dragresize",
+            "converse-headline",
+            "converse-minimize",
+            "converse-otr",
+            "converse-register",
+            "converse-vcard",
+        ],
+        notify_all_room_messages: [
+            'anonymous@conference.nomnom.im',
+        ],
+        bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
+        jid: 'nomnom.im', // XMPP server which allows anonymous login (doesn't
+                            // allow chatting with other XMPP servers).
+        keepalive: true,
+        hide_muc_server: true, // Federation is disabled, so no use in
+                                // showing the MUC server.
+        play_sounds: true,
+        strict_plugin_dependencies: false
     });
 </script>
 </html>
diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 70a549865..20d261b23 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -9,6 +9,8 @@
 - sinon 2.1.0
 - eslint 3.19.0
 
+- Enable creation of `dist/converse-muc-embedded.js` build file for the
+  embedded MUC room demo. [jcbrand]
 - Use `noConflict` to avoid polluting globale namespace with lodash and Backbone. [jcbrand]
 - Bugfix: MUC user's nickname wasn't being shown in HTML5 notification messages. [jcbrand]
 - Bugfix: OTR meta-messages were being shown in HTML5 notifications. [jcbrand]
diff --git a/src/converse-embedded.js b/src/converse-embedded.js
new file mode 100644
index 000000000..7c279f85f
--- /dev/null
+++ b/src/converse-embedded.js
@@ -0,0 +1,24 @@
+/*global define */
+if (typeof define !== 'undefined') {
+    // The section below determines which plugins will be included in a build
+    define([
+        "converse-core",
+        // PLEASE NOTE: By default all translations are included.
+        // You can modify the file src/locales.js to include only those
+        // translations that you care about.
+
+        /* START: Removable components
+         * --------------------
+         * Any of the following components may be removed if they're not needed.
+         */
+        "converse-chatview",    // Renders standalone chat boxes for single user chat
+        "converse-mam",         // XEP-0313 Message Archive Management
+        "converse-muc",         // XEP-0045 Multi-user chat
+        "converse-muc-embedded",
+        "converse-ping",        // XEP-0199 XMPP Ping
+        "converse-notification",// HTML5 Notifications
+        /* END: Removable components */
+    ], function (converse) {
+        return converse;
+    });
+}