diff --git a/contrib/isql b/contrib/isql
index 84eba203..fd66af58 100644
--- a/contrib/isql
+++ b/contrib/isql
@@ -8,6 +8,6 @@ _isql()
 	local cur
 	cur=`_get_cword`
   
-	COMPREPLY=( $( grep \\[$cur $ODBCINI | tr -d \\[\\] ) )
+	[ -f "$ODBCINI" ] && COMPREPLY=( $( grep \\[$cur "$ODBCINI" | tr -d \\[\\] ) )
 }
 complete -F _isql isql
diff --git a/debian/changelog b/debian/changelog
index d72a86f4..2a349aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ bash-completion (1:1.x) UNRELEASED; urgency=low
   [ David Paleino ]
   * Prepare for future development.
 
-  [ Freddy Vulto ]
-  * Make `_mii-tool()' and `_mii-diag()' POSIX-compliant
-
  -- Freddy Vulto <fvulto@gmail.com>  Sun, 22 Feb 2009 11:32:41 +0100
 
 bash-completion (1:1.0-1) UNRELEASED; urgency=low
@@ -152,8 +149,11 @@ bash-completion (1:1.0-1) UNRELEASED; urgency=low
   * Removed duplicate completion option `-borderwidth' for `display'
   * Prevent completion dir from being sourced twice if
     BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433) 
+  * Make `_mii-tool()' and `_mii-diag()' POSIX-compliant
+  * Fix _isql completion waiting for grep input if $ODBCINI not set; handle
+    whitespace in $ODBCINI.
 
- -- David Paleino <d.paleino@gmail.com>  Sat, 21 Feb 2009 23:13:13 +0100
+ -- Freddy Vulto <fvulto@gmail.com>  Wed, 25 Feb 2009 21:16:46 +0100
 
 bash-completion (20080705) unstable; urgency=low