diff --git a/to_review/minicom b/contrib/minicom
similarity index 59%
rename from to_review/minicom
rename to contrib/minicom
index 7662676d..dcc4b5f2 100644
--- a/to_review/minicom
+++ b/contrib/minicom
@@ -6,7 +6,7 @@
 have minicom &&
 _minicom()
 {
-	local cur prev
+	local cur prev confdir
 
 	COMPREPLY=()
 	cur=`_get_cword`
@@ -31,9 +31,16 @@ _minicom()
 
 	if [[ "$cur" == -* ]]; then
 		COMPREPLY=( $( compgen -W '-s -o -m -M -z -l -L -w -a -t \
-			-c -S -d -p -C -T -8' -- $cur ) )
+			-c -S -d -p -C -T -7 -8' -- $cur ) )
+		return 0
 	else
-		COMPREPLY=( $( command ls /etc/minirc.* | sed -e 's|/etc/minirc.||' | grep "^$cur" ) )
+		[ -n "$( command ls /etc/minirc.* 2>/dev/null)" ] && confdir=/etc
+		[ -n "$( command ls /etc/minicom/minirc.* 2>/dev/null)" ] && confdir=/etc/minicom
+		if [ -n "$confdir" ]; then
+			COMPREPLY=( $( compgen -W '$( command ls $confdir/minirc.* | \
+				sed -e "s|$confdir/minirc.||")' -- $cur ) )
+			return 0
+		fi
 	fi
 } &&
-complete -F _minicom minicom
+complete -F _minicom $default minicom
diff --git a/debian/changelog b/debian/changelog
index 3668416a..9af1a8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ bash-completion (200902xx) UNRELEASED; urgency=low
   * Added cpan2dist completion
   * Added qemu completion
   * Added net-tools (mii-tool and mii-diag) completions
+  * Added minicom completion
 
   [ David Paleino ]
   * Added .kar to Timidity completion.
@@ -127,7 +128,7 @@ bash-completion (200902xx) UNRELEASED; urgency=low
   * Prevent completion dir from being sourced twice if
     BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433) 
 
- -- David Paleino <d.paleino@gmail.com>  Thu, 05 Feb 2009 09:48:08 +0100
+ -- David Paleino <d.paleino@gmail.com>  Thu, 05 Feb 2009 10:04:16 +0100
 
 bash-completion (20080705) unstable; urgency=low