diff --git a/resources/rapydscript/compiler.js b/resources/rapydscript/compiler.js
index 84bd764fa6..9ec823eb08 100644
--- a/resources/rapydscript/compiler.js
+++ b/resources/rapydscript/compiler.js
@@ -5955,6 +5955,6 @@ function OutputStream(options) {
     });
 })();
 
-rs_baselib_pyj = "\"\"\"\n**********************************************************************\n\n  A RapydScript to JavaScript compiler.\n  https://github.com/atsepkov/RapydScript2\n\n  -------------------------------- (C) ---------------------------------\n\n                       Author: Alexander Tsepkov\n                         <atsepkov@pyjeon.com>\n                         http://www.pyjeon.com\n\n  Distributed under Apache 2.0 license:\n    Copyright 2013 (c) Alexander Tsepkov <atsepkov@pyjeon.com>\n\n  RapydScript source code is originally based on UglifyJS2 (covered\n  by BSD license). UglifyJS2 was written by Mihai Bazon\n  <mihai.bazon@gmail.com>, who is its respective copyright holder.\n\n    Redistribution and use in source and binary forms, with or without\n    modification, are permitted provided that the following conditions\n    are met:\n\n        * Redistributions of source code must retain the above\n          copyright notice, this list of conditions and the following\n          disclaimer.\n\n        * Redistributions in binary form must reproduce the above\n          copyright notice, this list of conditions and the following\n          disclaimer in the documentation and/or other materials\n          provided with the distribution.\n\n    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER \u201cAS IS\u201d AND ANY\n    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE\n    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,\n    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR\n    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF\n    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n    SUCH DAMAGE.\n\n **********************************************************************\n\"\"\"\n\"use strict\"\n\n{\n\"abs\": def abs(n):\n    return Math.abs(n)\n,\n\"bind\": def _$rapyd$_bind(fn, thisArg):\n    if fn.orig: fn = fn.orig\n    if thisArg == False: return fn\n    ret = def():\n        return fn.apply(thisArg, arguments)\n    ret.orig = fn\n    return ret\n,\n\"rebind_all\": def _$rapyd$_rebindAll(thisArg, rebind):\n    if JS('typeof rebind') == \"undefined\": rebind = True\n    for JS('var p in thisArg'):\n        if thisArg[p] and thisArg[p].orig:\n            if rebind: thisArg[p] = _$rapyd$_bind(thisArg[p], thisArg)\n            else: thisArg[p] = thisArg[p].orig\n,\n\"dir\": def dir(item):\n    # TODO: this isn't really representative of real Python's dir(), nor is it\n    # an intuitive replacement for \"for ... in\" loop, need to update this logic\n    # and introduce a different way of achieving \"for ... in\"\n    arr = []\n    for JS('var i in item'): arr.push(i)\n    return arr\n,\n\"enumerate\": def enumerate(item):\n    arr = []\n    for JS('var i=0;i<item.length;i++'): arr[arr.length] = [i, item[i]]\n    return arr\n,\n\"eslice\": def _$rapyd$_eslice(arr, step, start, end):\n    arr = arr[:]\n    if type(arr) == 'string' or isinstance(arr, String):\n        isString = True\n        arr = arr.split('')\n\n    if step < 0:\n        step = -step\n        arr.reverse()\n        if type(start) != \"undefined\": start = arr.length - start - 1\n        if type(end) != \"undefined\": end = arr.length - end - 1\n    if type(start) == \"undefined\": start = 0\n    if type(end) == \"undefined\": end = arr.length\n\n    arr = arr.slice(start, end).filter(def(e, i): return i % step == 0;)\n    return isString ? arr.join('') : arr\n,\n\"extends\": def _$rapyd$_extends(child, parent):\n    child.prototype = Object.create(parent.prototype)\n    child.prototype.constructor = child\n,\n\"in\": def _$rapyd$_in(val, arr):\n    if isinstance(arr, Array) or JS('typeof arr') == 'string': return arr.indexOf(val) != -1\n    else:\n        if arr.hasOwnProperty(val): return True\n        return False\n,\n\"iterable\": def _$rapyd$_Iterable(iterable):\n    if isinstance(iterable, Array) or isinstance(iterable, String) or JS('typeof iterable') == 'string': return iterable\n    return Object.keys(iterable)    # so we can use 'for ... in' syntax with hashes\n,\n\"len\": def len(obj):\n    if isinstance(obj, Array) or JS('typeof obj') == 'string': return obj.length\n    else:\n        count = 0\n        for JS('var i in obj'):\n            if obj.hasOwnProperty(i): count += 1\n        return count\n,\n\"mixin\": def _$rapyd$_mixin(target, source, overwrite):\n    for JS('var i in source'):\n        if source.hasOwnProperty(i) and overwrite or JS('typeof target[i]') == 'undefined': target[i] = source[i]\n,\n\"print\": def _$rapyd$_print(*args):\n    output = JSON.stringify(args)\n    if JS('typeof console') == 'object': console.log(output.substr(1, output.length-2))\n,\n\"range\": def range(start, stop, step):\n    if arguments.length <= 1:\n        stop = start or 0\n        start = 0\n    step = arguments[2] or 1\n\n    length = Math.max(Math.ceil((stop - start) / step), 0)\n    idx = 0\n    range = Array(length)\n\n    while idx < length:\n        range[JS('idx++')] = start\n        start += step\n    return range\n,\n\"reversed\": def reversed(arr):\n    tmp = arr[:]\n    return tmp.reverse()\n,\n\"sum\": def sum(arr, start=0):\n    return arr.reduce(\n        def(prev, cur): return prev+cur\n        ,\n        start\n    )\n,\n\"getattr\": def getattr(obj, name):\n    return obj[name]\n,\n\"setattr\": def setattr(obj, name, value):\n    obj[name] = value\n,\n\"hasattr\": def hasattr(obj, name):\n    return JS('name in obj')\n}\n"
+rs_baselib_pyj = {"beautifed": {"extends": "function _$rapyd$_extends(child, parent) {\n    child.prototype = Object.create(parent.prototype);\n    child.prototype.constructor = child;\n}", "bind": "function _$rapyd$_bind(fn, thisArg) {\n    var ret;\n    if (fn.orig) {\n        fn = fn.orig;\n    }\n    if (thisArg === false) {\n        return fn;\n    }\n    ret = function() {\n        return fn.apply(thisArg, arguments);\n    };\n    ret.orig = fn;\n    return ret;\n}", "iterable": "function _$rapyd$_Iterable(iterable) {\n    if (iterable instanceof Array || iterable instanceof String || typeof iterable === \"string\") {\n        return iterable;\n    }\n    return Object.keys(iterable);\n}", "mixin": "function _$rapyd$_mixin(target, source, overwrite) {\n    for (var i in source) {\n        if (source.hasOwnProperty(i) && overwrite || typeof target[i] === \"undefined\") {\n            target[i] = source[i];\n        }\n    }\n}", "print": "function _$rapyd$_print() {\n    var args = [].slice.call(arguments, 0);\n    var output;\n    output = JSON.stringify(args);\n    if (typeof console === \"object\") {\n        console.log(output.substr(1, output.length - 2));\n    }\n}", "enumerate": "function enumerate(item) {\n    var arr;\n    arr = [];\n    for (var i=0;i<item.length;i++) {\n        arr[arr.length] = [ i, item[i] ];\n    }\n    return arr;\n}", "getattr": "function getattr(obj, name) {\n    return obj[name];\n}", "in": "function _$rapyd$_in(val, arr) {\n    if (arr instanceof Array || typeof arr === \"string\") {\n        return arr.indexOf(val) !== -1;\n    } else {\n        if (arr.hasOwnProperty(val)) {\n            return true;\n        }\n        return false;\n    }\n}", "reversed": "function reversed(arr) {\n    var tmp;\n    tmp = arr.slice(0);\n    return tmp.reverse();\n}", "hasattr": "function hasattr(obj, name) {\n    return name in obj;\n}", "len": "function len(obj) {\n    var count;\n    if (obj instanceof Array || typeof obj === \"string\") {\n        return obj.length;\n    } else {\n        count = 0;\n        for (var i in obj) {\n            if (obj.hasOwnProperty(i)) {\n                count += 1;\n            }\n        }\n        return count;\n    }\n}", "setattr": "function setattr(obj, name, value) {\n    obj[name] = value;\n}", "range": "function range(start, stop, step) {\n    if (arguments.length <= 1) {\n        stop = start || 0;\n        start = 0;\n    }\n    step = arguments[2] || 1;\n}", "dir": "function dir(item) {\n    var arr;\n    arr = [];\n    for (var i in item) {\n        arr.push(i);\n    }\n    return arr;\n}", "eslice": "function _$rapyd$_eslice(arr, step, start, end) {\n    var isString;\n    arr = arr.slice(0);\n    if (typeof arr === \"string\" || arr instanceof String) {\n        isString = true;\n        arr = arr.split(\"\");\n    }\n}", "abs": "function abs(n) {\n    return Math.abs(n);\n}", "sum": "function sum(arr, start) {\n    if (typeof start === \"undefined\") start = 0;\n    return arr.reduce(function(prev, cur) {\n        return prev + cur;\n    }, start);\n}"}, "minified": {"extends": "function _$rapyd$_extends(child,parent){child.prototype=Object.create(parent.prototype);child.prototype.constructor=child}", "bind": "function _$rapyd$_bind(fn,thisArg){var ret;if(fn.orig){fn=fn.orig}if(thisArg===false){return fn}ret=function(){return fn.apply(thisArg,arguments)};ret.orig=fn;return ret}", "iterable": "function _$rapyd$_Iterable(iterable){if(iterable instanceof Array||iterable instanceof String||typeof iterable===\"string\"){return iterable}return Object.keys(iterable)}", "mixin": "function _$rapyd$_mixin(target,source,overwrite){for(var i in source){if(source.hasOwnProperty(i)&&overwrite||typeof target[i]===\"undefined\"){target[i]=source[i]}}}", "print": "function _$rapyd$_print(){var args=[].slice.call(arguments,0);var output;output=JSON.stringify(args);if(typeof console===\"object\"){console.log(output.substr(1,output.length-2))}}", "enumerate": "function enumerate(item){var arr;arr=[];for(var i=0;i<item.length;i++){arr[arr.length]=[i,item[i]]}return arr}", "getattr": "function getattr(obj,name){return obj[name]}", "in": "function _$rapyd$_in(val,arr){if(arr instanceof Array||typeof arr===\"string\"){return arr.indexOf(val)!==-1}else{if(arr.hasOwnProperty(val)){return true}return false}}", "reversed": "function reversed(arr){var tmp;tmp=arr.slice(0);return tmp.reverse()}", "hasattr": "function hasattr(obj,name){return name in obj}", "len": "function len(obj){var count;if(obj instanceof Array||typeof obj===\"string\"){return obj.length}else{count=0;for(var i in obj){if(obj.hasOwnProperty(i)){count+=1}}return count}}", "setattr": "function setattr(obj,name,value){obj[name]=value}", "range": "function range(start,stop,step){if(arguments.length<=1){stop=start||0;start=0}step=arguments[2]||1}", "dir": "function dir(item){var arr;arr=[];for(var i in item){arr.push(i)}return arr}", "eslice": "function _$rapyd$_eslice(arr,step,start,end){var isString;arr=arr.slice(0);if(typeof arr===\"string\"||arr instanceof String){isString=true;arr=arr.split(\"\")}}", "abs": "function abs(n){return Math.abs(n)}", "sum": "function sum(arr,start){if(typeof start===\"undefined\")start=0;return arr.reduce(function(prev,cur){return prev+cur},start)}"}};
 
-rs_package_version = "0.3.4"
\ No newline at end of file
+rs_package_version = "0.3.4";
diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py
index 1ef5fe915a..aeada3c82e 100644
--- a/src/calibre/utils/rapydscript.py
+++ b/src/calibre/utils/rapydscript.py
@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import os, json, sys, errno
+import os, json, sys, errno, re
 from threading import local
 
 from calibre.utils.terminal import ANSIStream, colored
@@ -17,7 +17,45 @@ COMPILER_PATH = 'rapydscript/compiler.js'
 def abspath(x):
     return os.path.realpath(os.path.abspath(x))
 
-def update_rapydscript():  # {{{
+# Update RapydScript {{{
+def parse_baselib(src):
+    # duktape does not store function source code, so we have to do it manually
+    start = re.compile(r'''['"]([a-zA-Z0-9]+)['"]\s*:''')
+    in_func = None
+    funcs = {}
+    for line in src.splitlines():
+        line = line.rstrip()
+        if in_func is None:
+            m = start.match(line)
+            if m is not None:
+                funcs[m.group(1)] = in_func = [line.partition(':')[-1].lstrip()]
+        else:
+            if line in ',}':
+                in_func = None
+            else:
+                in_func.append(line)
+    funcs = {k:'\n'.join(v) for k, v in funcs.iteritems()}
+    return funcs
+
+def compile_baselib(ctx, baselib, beautify=True):
+    ctx.g.current_output_options = {'beautify':beautify, 'private_scope':False}
+    ctx.g.filename = 'baselib.pyj'
+    ctx.g.basedir = ''
+    ctx.g.libdir = ''
+
+    def doit(src):
+        src += '\n'
+        ctx.g.code = src
+        try:
+            return ctx.eval(COMPILER_JS)
+        except Exception as e:
+            print ('Failed to compile source:')
+            print (src)
+            raise SystemExit(str(e))
+
+    return {k:doit(v) for k, v in sorted(baselib.iteritems())}
+
+def update_rapydscript():
     from duktape import Context, JSError
     vm_js = '''
     exports.createContext = function(x) { x.AST_Node = {}; return x; }
@@ -49,14 +87,33 @@ def update_rapydscript():  # {{{
     data = b'\n\n'.join(open(os.path.join(base, 'bin', x.lstrip('/')), 'rb').read() for x in ctx.g.RapydScript.FILES)
 
     package = json.load(open(os.path.join(base, 'package.json')))
+    baselib = parse_baselib(open(os.path.join(base, 'src', 'baselib.pyj'), 'rb').read().decode('utf-8'))
+    ctx = Context()
+    ctx.eval(data.decode('utf-8'))
+    baselib = {'beautifed': compile_baselib(ctx, baselib), 'minified': compile_baselib(ctx, baselib, False)}
+
     with open(P(COMPILER_PATH, allow_user_override=False), 'wb') as f:
         f.write(data)
-        f.write(b'\n\nrs_baselib_pyj = ' + json.dumps(open(os.path.join(base, 'src', 'baselib.pyj'), 'rb').read().decode('utf-8')))
-        f.write(b'\n\nrs_package_version = ' + json.dumps(package['version']))
+        f.write(b'\n\nrs_baselib_pyj = ' + json.dumps(baselib) + b';')
+        f.write(b'\n\nrs_package_version = ' + json.dumps(package['version']) + b';\n')
 # }}}
 
 # Compiler {{{
 tls = local()
+COMPILER_JS = '''
+(function() {
+var output = OutputStream(current_output_options);
+var ast = parse(code, {
+    filename: filename,
+    readfile: Duktape.readfile,
+    basedir: basedir,
+    auto_bind: false,
+    libdir: libdir
+});
+ast.print(output);
+return output.get();
+})();
+'''
 
 def to_dict(obj):
     return dict(zip(obj.keys(), obj.values()))
@@ -75,21 +132,17 @@ class PYJError(Exception):
         Exception.__init__(self, '')
         self.errors = errors
 
-def compile_pyj(data, filename='<stdin>', beautify=True, private_scope=True, libdir=None):
-    from duktape import JSError
+def compile_pyj(data, filename='<stdin>', beautify=True, private_scope=True, libdir=None, omit_baselib=False):
+    import duktape
     if isinstance(data, bytes):
         data = data.decode('utf-8')
     c = compiler()
-    c.g.current_output_options = {'beautify':beautify, 'private_scope':private_scope}
-    # Add baselib.pyj
-    c.eval('''
-(function() {
-    var baselib_ast = parse(rs_baselib_pyj, {readfile:Duktape.readfile});
-    var os = OutputStream({private_scope:false, beautify:current_output_options.beautify});
-    baselib_ast.print(os);
-    current_output_options.baselib = eval(os.toString());
-})();
-''')
+    c.g.current_output_options = {
+        'beautify':beautify,
+        'private_scope':private_scope,
+        'omit_baselib': omit_baselib,
+        'baselib':dict(dict(c.g.rs_baselib_pyj)['beautifed' if beautify else 'minified']),
+    }
     d = os.path.dirname
     c.g.libdir = libdir or os.path.join(d(d(d(abspath(__file__)))), 'pyj')
     c.g.code = data
@@ -98,21 +151,8 @@ def compile_pyj(data, filename='<stdin>', beautify=True, private_scope=True, lib
     errors = []
     c.g.AST_Node.warn = lambda templ, data:errors.append(to_dict(data))
     try:
-        return c.eval('''
-(function() {
-var output = OutputStream(current_output_options);
-var ast = parse(code, {
-    filename: filename,
-    readfile: Duktape.readfile,
-    basedir: basedir,
-    auto_bind: false,
-    libdir: libdir
-});
-ast.print(output);
-return output.get();
-})();
-        ''')
-    except JSError:
+        return c.eval(COMPILER_JS)
+    except duktape.JSError:
         if errors:
             raise PYJError(errors)
         raise
@@ -253,6 +293,8 @@ def main(args=sys.argv):
             version='Using RapydScript compiler version: '+ver)
     parser.add_argument('--show-js', action='store_true', help='Have the REPL output compiled javascript before executing it')
     parser.add_argument('--libdir', help='Where to look for imported modules')
+    parser.add_argument('--omit-baselib', action='store_true', default=False, help='Omit the RapydScript base library')
+    parser.add_argument('--no-private-scope', action='store_true', default=False, help='Do not wrap the output in its own private scope')
     args = parser.parse_args(args)
     libdir = os.path.expanduser(args.libdir) if args.libdir else None
 
@@ -262,7 +304,8 @@ def main(args=sys.argv):
         from duktape import JSError
         try:
             enc = getattr(sys.stdin, 'encoding', 'utf-8') or 'utf-8'
-            sys.stdout.write(compile_pyj(sys.stdin.read().decode(enc), libdir=libdir))
+            data = compile_pyj(sys.stdin.read().decode(enc), libdir=libdir, private_scope=not args.no_private_scope, omit_baselib=args.omit_baselib)
+            print(data.encode(enc))
         except PYJError as e:
             for e in e.errors:
                 print(format_error(e), file=sys.stderr)