diff --git a/shurly.install b/shurly.install
index b84dde6..0ccae87 100644
--- a/shurly.install
+++ b/shurly.install
@@ -121,6 +121,13 @@ function shurly_schema() {
  */
 function shurly_install() {
   drupal_install_schema('shurly');
+  // Run manual query to make the source field case sensitive
+  $ret = array();
+  db_drop_index($ret, 'shurly', 'source'); 
+  $ret[] = update_sql("ALTER TABLE {Shurly} CHANGE `Source` `Source` VARCHAR(255) BINARY NOT NULL");
+  db_add_index($ret, 'shurly', 'source', array('source' => 'source'));
+
+  return $ret;
 }
 
 function shurly_update_6100() {
@@ -149,6 +156,19 @@ function shurly_update_6101() {
 }
 
 /**
+ * Make the source field case-sensitive.
+ */
+function shurly_update_6102(){
+  $ret = array();
+  
+  db_drop_index($ret, 'shurly', 'source'); 
+  $ret[] = update_sql("ALTER TABLE {Shurly} CHANGE `Source` `Source` VARCHAR(255) BINARY NOT NULL");
+  db_add_index($ret, 'shurly', 'source', array('source' => 'source')); 
+
+  return $ret;
+}
+
+/**
  * Implement hook_uninstall().
  */
 function shurly_uninstall() {
diff --git a/shurly.module b/shurly.module
index 353c427..85cd576 100644
--- a/shurly.module
+++ b/shurly.module
@@ -98,7 +98,7 @@ function shurly_boot() {
   // if the path has any slashes in it, it's not a short URL
   // so we can bail out and save ourselves a database call
   if (isset($_GET['q']) && strpos($_GET['q'], '/') === FALSE) {
-    $row = db_fetch_object(db_query("SELECT rid, destination FROM {shurly} WHERE BINARY source = '%s' AND active = 1", $_GET['q']));
+    $row = db_fetch_object(db_query("SELECT rid, destination FROM {shurly} WHERE source = '%s' AND active = 1", $_GET['q']));
     if ($row) {
       shurly_goto($row);
     }
@@ -820,8 +820,7 @@ function shurly_url_exists($short, $long = NULL) {
  *  NOTE: Always check $redirect->active before using the result
  */
 function shurly_get_redirect($short_url, $check_active = FALSE) {
-  // we add 'BINARY' to ensure that we're doing a CASE SENSITIVE query
-  $query = "SELECT * FROM {shurly} WHERE BINARY source = '%s'";
+  $query = "SELECT * FROM {shurly} WHERE source = '%s'";
   if ($check_active) {
     $query .= ' AND active = 1';
   }