diff --git a/CHANGES.rst b/CHANGES.rst
index 49ebaf119a..3a5fa5153a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,14 @@
 Change Log
 ----------
 
-1.6
+1.6.1
+~~~~~
+Released on April 23, 2015
+
+* Used RequireJS
+
+
+1.6.0
 ~~~
 Released on April 13, 2015
 
diff --git a/ajax_select/static/js/ajax_select.js b/ajax_select/static/js/ajax_select.js
index b3990f540b..a71f7c1780 100644
--- a/ajax_select/static/js/ajax_select.js
+++ b/ajax_select/static/js/ajax_select.js
@@ -1,282 +1,277 @@
-if (typeof jQuery == 'undefined') {
-    try { // use django admins
-        jQuery=django.jQuery;
-    } catch(err) {
-        document.write('<script type="text/javascript"  src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"><\/script>');
-    }
-}
-if(typeof jQuery == 'undefined' || (typeof jQuery.ui == 'undefined')) {
-    document.write('<script type="text/javascript"  src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"><\/script>');
-    document.write('<link type="text/css" rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/smoothness/jquery-ui.css" />');
-}
-//]]>
-
-if(typeof jQuery.fn.autocompletehtml != 'function') {
-
-(function($) {
-
-$.fn.autocompletehtml = function() {
-    var $text = $(this), sizeul = true;
-    this.data("autocomplete")._renderItem = function _renderItemHTML(ul, item) {
-        if(sizeul) {
-            if(ul.css('max-width')=='none') ul.css('max-width',$text.outerWidth());
-            sizeul = false;
-        }
-        return $("<li></li>")
-            .data("item.autocomplete", item)
-            .append("<a>" + item.match + "</a>")
-            .appendTo(ul);
+define(['jquery', 'mustache', 'jquery-ui'], function ($, Mustache) {
+    'use strict';
+    var instance, its;
+
+    $.fn.autocompletehtml = function() {
+        var $text = $(this), sizeul = true;
+        this.data('uiAutocomplete')._renderItem = function _renderItemHTML(
+            ul, item
+        ) {
+            if(sizeul) {
+                if(ul.css('max-width')=='none') ul.css(
+                    'max-width',$text.outerWidth()
+                );
+                sizeul = false;
+            }
+            return $('<li></li>')
+                .data('item.autocomplete', item)
+                .append('<a>' + item.match + '</a>')
+                .appendTo(ul);
+        };
+        return this;
     };
-    return this;
-}
-$.fn.autocompleteselect = function(options) {
 
-    return this.each(function() {
-        var id = this.id;
-        var $this = $(this);
+    $.fn.autocompleteselect = function(options) {
 
-        var $text = $("#"+id+"_text");
-        var $deck = $("#"+id+"_on_deck");
+        return this.each(function() {
+            var id = this.id;
+            var $this = $(this);
 
-        function receiveResult(event, ui) {
-            if ($this.val()) {
-                kill();
-            }
-            $this.val(ui.item.pk);
-            $text.val('');
-            addKiller(ui.item.repr, null, ui.item.url);
-            $deck.trigger("added");
-            $this.change();
-            return false;
-        }
+            var $text = $('#' + id + '_text');
+            var $deck = $('#' + id + '_on_deck');
 
-        function addKiller(repr, pk, url) {
-            killer_id = "kill_" + pk + id;
-            killButton = '<span class="ui-icon ui-icon-trash" id="'+killer_id+'">X</span> ';
-            if (repr) {
-                $deck.empty();
-                if (url){
-                    repr = '<a href="' + url + '" target="_blank">' + repr + '</a>';
+            function receiveResult(event, ui) {
+                if ($this.val()) {
+                    kill();
                 }
-                $deck.append("<div>" + killButton + repr + "</div>");
-            } else {
-                $("#"+id+"_on_deck > div").prepend(killButton);
+                $this.val(ui.item.pk);
+                $text.val('');
+                addKiller(ui.item.repr, null, ui.item.url);
+                $deck.trigger('added');
+                $this.change();
+                return false;
             }
-            $("#" + killer_id).click(function() {
-                if (options.confirm_text){
-                    var delete_item = confirm(options.confirm_text);
-                    if (delete_item) {
-                        kill();
-                        $deck.trigger("killed");
+
+            function addKiller(repr, pk, url) {
+                var killer_id, killButton;
+                killer_id = 'kill_' + pk + id;
+                killButton = '<span class="ui-icon ui-icon-trash" id="'+killer_id+'">X</span> ';
+                if (repr) {
+                    $deck.empty();
+                    if (url){
+                        repr = '<a href="' + url + '" target="_blank">' + repr + '</a>';
                     }
+                    $deck.append('<div>' + killButton + repr + '</div>');
                 } else {
-                    kill();
-                    $deck.trigger("killed");
+                    $('#'+id+'_on_deck > div').prepend(killButton);
                 }
-            });
-        }
-
-        function kill() {
-            $this.val('');
-            $this.change();
-            $deck.children().fadeOut(1.0).remove();
-        }
+                $('#' + killer_id).click(function() {
+                    if (options.confirm_text){
+                        var delete_item = confirm(options.confirm_text);
+                        if (delete_item) {
+                            kill();
+                            $deck.trigger('killed');
+                        }
+                    } else {
+                        kill();
+                        $deck.trigger('killed');
+                    }
+                });
+            }
 
-        options.select = receiveResult;
-        $text.autocomplete(options);
-        $text.autocompletehtml();
+            function kill() {
+                $this.val('');
+                $this.change();
+                $deck.children().fadeOut(1.0).remove();
+            }
 
-        if (options.initial) {
-            its = options.initial;
-            addKiller(its[0], its[1]);
-        }
+            options.select = receiveResult;
+            $text.autocomplete(options);
+            $text.autocompletehtml();
 
-        $this.bind('didAddPopup', function(event, pk, repr) {
-            ui = { item: { pk: pk, repr: repr } };
-            receiveResult(null, ui);
-        });
+            if (options.initial) {
+                its = options.initial;
+                addKiller(its[0], its[1]);
+            }
 
-        $this.change(function (ev) {
-            var pk, repr, ui;
-            if (typeof ev.cloneSource !== 'undefined') {
-                pk = ev.cloneSource.val();
-                // depends on addKiller implementation
-                repr = ev.cloneSource.next().children('div').children().slice(1);
-                repr = $.map(repr, function (el) {
-                    return el.outerHTML;
-                }).join('');
-                ui = { item: { pk: pk, repr: repr } };
+            $this.bind('didAddPopup', function(event, pk, repr) {
+                var ui = {item: {pk: pk, repr: repr}};
                 receiveResult(null, ui);
-            }
-        });
-    });
-};
+            });
 
-$.fn.autocompleteselectmultiple = function(options) {
-    return this.each(function() {
-        var id = this.id;
+            $this.change(function (ev) {
+                var pk, repr, ui;
+                if (typeof ev.cloneSource !== 'undefined') {
+                    pk = ev.cloneSource.val();
+                    // depends on addKiller implementation
+                    repr = ev.cloneSource.next().children('div').children().slice(1);
+                    repr = $.map(repr, function (el) {
+                        return el.outerHTML;
+                    }).join('');
+                    ui = { item: { pk: pk, repr: repr } };
+                    receiveResult(null, ui);
+                }
+            });
+        });
+    };
 
-        var $this = $(this);
-        var $text = $("#"+id+"_text");
-        var $deck = $("#"+id+"_on_deck");
+    $.fn.autocompleteselectmultiple = function(options) {
+        return this.each(function() {
+            var id = this.id;
 
-        function receiveResult(event, ui) {
-            pk = ui.item.pk;
-            prev = $this.val();
+            var $this = $(this);
+            var $text = $('#' + id + '_text');
+            var $deck = $('#' + id + '_on_deck');
 
-            if (prev.indexOf("|"+pk+"|") == -1) {
-                $this.val((prev ? prev : "|") + pk + "|");
-                addKiller(ui.item.repr, pk, ui.item.url);
-                $text.val('');
-                $deck.trigger("added");
-                $this.change();
-            }
+            function receiveResult(event, ui) {
+                var pk = ui.item.pk;
+                var prev = $this.val();
 
-            return false;
-        }
+                if (prev.indexOf('|'+pk+'|') == -1) {
+                    $this.val((prev ? prev : '|') + pk + '|');
+                    addKiller(ui.item.repr, pk, ui.item.url);
+                    $text.val('');
+                    $deck.trigger('added');
+                    $this.change();
+                }
 
-        function addKiller(repr, pk, url) {
-            killer_id = "kill_" + pk + id;
-            killButton = '<span class="ui-icon ui-icon-trash" id="'+killer_id+'">X</span> ';
-            var item_content = null;
-            if (url) {
-                item_content = '<div id="'+ id +'_on_deck_' + pk + '">' +
-                    killButton + '<a href="' + url + '" target="_blank">' + repr + '</a></div>';
-            } else {
-                item_content = '<div id="'+id+'_on_deck_'+pk+'">' + killButton + repr + ' </div>';
+                return false;
             }
-            $deck.append(item_content);
 
-            $("#"+killer_id).click(function() {
-                if (options.confirm_text){
-                    var delete_item = confirm(options.confirm_text);
-                    if (delete_item) {
-                        kill(pk);
-                        $deck.trigger("killed");
-                    }
+            function addKiller(repr, pk, url) {
+                var killer_id, killButton;
+                killer_id = 'kill_' + pk + id;
+                killButton = '<span class="ui-icon ui-icon-trash" id="'+killer_id+'">X</span> ';
+                var item_content = null;
+                if (url) {
+                    item_content = '<div id="'+ id +'_on_deck_' + pk + '">' +
+                        killButton + '<a href="' + url + '" target="_blank">' + repr + '</a></div>';
                 } else {
-                    kill(pk);
-                    $deck.trigger("killed");
+                    item_content = '<div id="'+id+'_on_deck_'+pk+'">' + killButton + repr + ' </div>';
                 }
-            });
-        }
+                $deck.append(item_content);
+
+                $('#'+killer_id).click(function() {
+                    if (options.confirm_text){
+                        var delete_item = confirm(options.confirm_text);
+                        if (delete_item) {
+                            kill(pk);
+                            $deck.trigger('killed');
+                        }
+                    } else {
+                        kill(pk);
+                        $deck.trigger('killed');
+                    }
+                });
+            }
 
-        function kill(pk) {
-            $this.val($this.val().replace("|" + pk + "|", "|"));
-            $("#"+id+"_on_deck_"+pk).fadeOut().remove();
-        }
+            function kill(pk) {
+                $this.val($this.val().replace('|' + pk + '|', '|'));
+                $('#'+id+'_on_deck_'+pk).fadeOut().remove();
+            }
 
-        options.select = receiveResult;
-        $text.autocomplete(options);
-        $text.autocompletehtml();
+            options.select = receiveResult;
+            $text.autocomplete(options);
+            $text.autocompletehtml();
 
-        if (options.initial) {
-            $.each(options.initial, function(i, its) {
-                addKiller(its[0], its[1]);
+            if (options.initial) {
+                $.each(options.initial, function(i, its) {
+                    addKiller(its[0], its[1]);
+                });
+            }
+
+            $this.bind('didAddPopup', function(event, pk, repr) {
+                var ui = {item: {pk: pk, repr: repr}};
+                receiveResult(null, ui);
             });
-        }
 
-        $this.bind('didAddPopup', function(event, pk, repr) {
-            ui = { item: { pk: pk, repr: repr } }
-            receiveResult(null, ui);
-        });
+            function resetWidget() {
+                var allSelects = $this.parent().children('div');
+                allSelects.slice(1).remove();
+                $(allSelects[0]).children().remove();
+                $this.val('|');
+            }
 
-        function resetWidget() {
-            var allSelects = $this.parent().children('div');
-            allSelects.slice(1).remove();
-            $(allSelects[0]).children().remove();
-            $this.val("|");
-        }
+            $this.change(function (ev) {
+                if (typeof ev.cloneSource !== 'undefined') {
+                    resetWidget();
+
+                    var pk = ev.cloneSource.val();
+                    var pks = pk.split('|').slice(1, -1);
+
+                    var divs = ev.cloneSource.next().children('div');
+                    $.each(divs, function(key, item) {
+                        var repr = $(item).children('a').html();
+                        pk = pks[key];
+                        var ui = {
+                            item: {
+                                tabel: pk,
+                                match: repr,
+                                pk: pk,
+                                repr: repr,
+                                url: $(item).children('a').attr('href'),
+                                value: pk
+                            }
+                        };
+                        receiveResult(null, ui);
+                    });
+                }
+            });
+        });
+    };
 
-        $this.change(function (ev) {
-            if (typeof ev.cloneSource !== 'undefined') {
-                resetWidget();
-
-                var pk = ev.cloneSource.val();
-                var pks = pk.split('|').slice(1, -1);
-
-                var divs = ev.cloneSource.next().children('div');
-                $.each(divs, function(key, item) {
-                    var repr = $(item).children('a').html();
-                    pk = pks[key];
-                    var ui = {
-                        item: {
-                            tabel: pk,
-                            match: repr,
-                            pk: pk,
-                            repr: repr,
-                            url: $(item).children('a').attr('href'),
-                            value: pk
-                        }
-                    };
-                    receiveResult(null, ui);
-                });
+    window.addAutoComplete = function (prefix_id, callback ) { /*(html_id)*/
+        /* detects inline forms and converts the html_id if needed */
+        var prefix = 0;
+        var html_id = prefix_id;
+        if(html_id.indexOf('__prefix__') != -1) {
+            // Some dirty loop to find the appropriate element to apply the callback to
+            while ($('#' + html_id).length) {
+                html_id = prefix_id.replace(/__prefix__/, prefix++);
             }
-        });
-    });
-};
-
-window.addAutoComplete = function (prefix_id, callback ) { /*(html_id)*/
-    /* detects inline forms and converts the html_id if needed */
-    var prefix = 0;
-    var html_id = prefix_id;
-    if(html_id.indexOf("__prefix__") != -1) {
-        // Some dirty loop to find the appropriate element to apply the callback to
-        while ($('#'+html_id).length) {
-            html_id = prefix_id.replace(/__prefix__/, prefix++);
+            html_id = prefix_id.replace(/__prefix__/, prefix-2);
+            // Ignore the first call to this function, the one that is triggered when
+            // page is loaded just because the "empty" form is there.
+            if ($('#' + html_id + ', #' + html_id + '_text').hasClass('ui-autocomplete-input'))
+                return;
         }
-        html_id = prefix_id.replace(/__prefix__/, prefix-2);
-        // Ignore the first call to this function, the one that is triggered when
-        // page is loaded just because the "empty" form is there.
-        if ($("#"+html_id+", #"+html_id+"_text").hasClass("ui-autocomplete-input"))
-            return;
-    }
-    callback(html_id);
-}
-/*    the popup handler
-    requires RelatedObjects.js which is part of the django admin js
-    so if using outside of the admin then you would need to include that manually */
-window.didAddPopup = function (win,newId,newRepr) {
-    var name = windowname_to_id(win.name);
-    $("#"+name).trigger('didAddPopup',[html_unescape(newId),html_unescape(newRepr)]);
-    win.close();
-}
-
-})(jQuery);
-}
-
-var BobAjaxSelect = (function (window, undefined) {
-    'use strict';
-
-    var instance;
+        callback(html_id);
+    };
+    /*    the popup handler
+        requires RelatedObjects.js which is part of the django admin js so if
+        using outside of the admin then you would need to include that
+        manually
+    */
+    window.didAddPopup = function (win,newId,newRepr) {
+        var name = windowname_to_id(win.name);
+        $('#'+name).trigger('didAddPopup',[html_unescape(newId), html_unescape(newRepr)]);
+        win.close();
+    };
 
-    var BobAjaxSelectAPI = function () {}
+    var BobAjaxSelectAPI = function () {};
 
-    BobAjaxSelectAPI.prototype.register_text_field = function (selector, options) {
+    BobAjaxSelectAPI.prototype.register_text_field = function (
+        selector, options
+    ) {
         addAutoComplete(selector, function(html_id) {
-            options['select'] =
-                function(event, ui) {
-                    $("#"+html_id).val(ui.item.value).trigger("added");
-                    return false;
-                }
-            $("#"+html_id).autocomplete(options).autocompletehtml();
+            options.select = function(event, ui) {
+                $('#' + html_id).val(ui.item.value).trigger('added');
+                return false;
+            }
+            $('#' + html_id).autocomplete(options).autocompletehtml();
         });
-    }
+    };
 
-    BobAjaxSelectAPI.prototype.register_select_field = function (selector, options) {
+    BobAjaxSelectAPI.prototype.register_select_field = function (
+        selector, options
+    ) {
         addAutoComplete(selector, function(html_id) {
-           $("#"+html_id).autocompleteselect(options);
+           $('#' + html_id).autocompleteselect(options);
         });
-    }
+    };
 
-    BobAjaxSelectAPI.prototype.register_selectmultiple_field = function (selector, options) {
+    BobAjaxSelectAPI.prototype.register_selectmultiple_field = function (
+            selector, options
+        ) {
         addAutoComplete(selector, function(html_id) {
-           $("#"+html_id).autocompleteselectmultiple(options);
+           $('#' + html_id).autocompleteselectmultiple(options);
         });
-    }
+    };
 
-    BobAjaxSelectAPI.prototype._register_fields = function (type, selector, options) {
-        var instance = BobAjaxSelect.getInstance();
+    BobAjaxSelectAPI.prototype._register_fields = function (
+        type, selector, options
+    ) {
+        var instance = getInstance();
         switch (type) {
             case 'text':
                 instance.register_text_field(selector, options);
@@ -288,10 +283,10 @@ var BobAjaxSelect = (function (window, undefined) {
                 instance.register_selectmultiple_field(selector, options);
                 break;
         }
-    }
+    };
 
     BobAjaxSelectAPI.prototype.register_in_element = function (element) {
-        var instance = BobAjaxSelect.getInstance();
+        var instance = getInstance();
         var text_fields = $(element).find('[data-bob-text-field-options]');
         var select_fields = $(element).find('[data-bob-select-field-options]');
         var selectmultiple_fields = $(element).find('[data-bob-selectmultiple-field-options]');
@@ -299,7 +294,7 @@ var BobAjaxSelect = (function (window, undefined) {
             'text': text_fields,
             'select': select_fields,
             'selectmultiple': selectmultiple_fields,
-        }
+        };
 
         $.each( fields, function( key, values ) {
             var data_name = 'bob-' + key + '-field-options';
@@ -320,7 +315,7 @@ var BobAjaxSelect = (function (window, undefined) {
                 var parentDeck = $('#' + $(input).data('parentId') + '_on_deck');
                 var childDeck = $('#' + childId + '_on_deck');
                 // get the original AJAX source from options
-                var options = $(input).data('autocomplete').options;
+                var options = $(input).data('uiAutocomplete').options;
                 var source = options.source;
                 // get the initial value that may be already selected on parent
                 var parent = $('#' + $(input).data('parentId'));
@@ -335,10 +330,10 @@ var BobAjaxSelect = (function (window, undefined) {
                 // reset the value of the hidden child field when it's deck gets killed
                 childDeck.on('killed', function () {
                     $(childHiddenSel).val('');
-                })
+                });
                 // modify the autocomplete function in a way that it apart the usual query
                 // (term) it should also send the value selected in the parent field (pk)
-                $(input).autocomplete("option", "source", function(request, response) {
+                $(input).autocomplete('option', 'source', function(request, response) {
                     $.getJSON(source, {'term': request.term, 'parent_pk': pk}, response);
                 });
             });
@@ -353,7 +348,7 @@ var BobAjaxSelect = (function (window, undefined) {
                     $(input).append($('<option></option>').val('').html('---------'));
                 };
                 var getChoices = function (input, pk, initial) {
-                    var optionSelected = $(input).find('option[selected=selected]').val()
+                    var optionSelected = $(input).find('option[selected=selected]').val();
                     $.ajax({
                         'type': 'GET',
                         'url': source + '?term=' + pk,
@@ -363,10 +358,10 @@ var BobAjaxSelect = (function (window, undefined) {
                             clearChoices(input);
                             for (var i = 0; i < json.length; i++) {
                                 $(input).append($('<option></option>').val(json[i].pk).html(json[i].value));
-                            };
+                            }
                             if (initial === true) {
                                 $(input).find('option[value=' + optionSelected + ']').attr('selected', 'selected');
-                            };
+                            }
                         }
                     });
                 };
@@ -398,28 +393,29 @@ var BobAjaxSelect = (function (window, undefined) {
             });
 
         })();
-    }
+    };
 
 
     BobAjaxSelectAPI.prototype.register_on_load = function () {
-        var instance = BobAjaxSelect.getInstance();
+        var instance = getInstance();
         instance.register_in_element($('body'));
-    }
+    };
 
-    var getInstance = function () {
+    function getInstance  () {
         if (!instance) {
             instance = new BobAjaxSelectAPI();
         }
         return instance;
     }
 
-    return {
-        getInstance: getInstance
+    function initialize() {
+        var bob_ajax_select_instance;
+        bob_ajax_select_instance = getInstance();
+        bob_ajax_select_instance.register_on_load();
     }
 
-})(window);
-
-$(document).ready(function() {
-    bob_ajax_select_instance = BobAjaxSelect.getInstance();
-    bob_ajax_select_instance.register_on_load();
+    return {
+        getInstance: getInstance,
+        initialize: initialize
+    };
 });
diff --git a/setup.py b/setup.py
index f65051f50a..c505bcbeac 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
     from setuptools import setup
 
 setup(name='bob-ajax-selects',
-    version='1.6',
+    version='1.6.1',
     description='jQuery-powered auto-complete fields for editing ForeignKey, ManyToManyField and CharField',
     author='Kamil Warguła, crucialfelix',
     author_email='kwargula@gmail.com crucialfelix@gmail.com',